[Pkg-owncloud-commits] [owncloud-client] 29/103: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Apr 30 18:08:56 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 edc7a9596a8a16082bd8c9cb7884d6343ea8291d
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Wed Apr 16 01:26:58 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 129 ++++++++++++++++++++++++++++---------------
translations/mirall_cs.ts | 92 +++++++++++++++++++++---------
translations/mirall_de.ts | 94 +++++++++++++++++++++----------
translations/mirall_el.ts | 92 +++++++++++++++++++++---------
translations/mirall_en.ts | 90 +++++++++++++++++++++---------
translations/mirall_es.ts | 96 ++++++++++++++++++++++----------
translations/mirall_es_AR.ts | 90 +++++++++++++++++++++---------
translations/mirall_et.ts | 92 +++++++++++++++++++++---------
translations/mirall_eu.ts | 90 +++++++++++++++++++++---------
translations/mirall_fa.ts | 90 +++++++++++++++++++++---------
translations/mirall_fi.ts | 92 +++++++++++++++++++++---------
translations/mirall_fr.ts | 92 +++++++++++++++++++++---------
translations/mirall_gl.ts | 94 +++++++++++++++++++++----------
translations/mirall_hu.ts | 90 +++++++++++++++++++++---------
translations/mirall_it.ts | 92 +++++++++++++++++++++---------
translations/mirall_ja.ts | 90 +++++++++++++++++++++---------
translations/mirall_nl.ts | 94 +++++++++++++++++++++----------
translations/mirall_pl.ts | 94 +++++++++++++++++++++----------
translations/mirall_pt.ts | 92 +++++++++++++++++++++---------
translations/mirall_pt_BR.ts | 92 +++++++++++++++++++++---------
translations/mirall_ru.ts | 90 +++++++++++++++++++++---------
translations/mirall_sk.ts | 90 +++++++++++++++++++++---------
translations/mirall_sl.ts | 92 +++++++++++++++++++++---------
translations/mirall_sv.ts | 92 +++++++++++++++++++++---------
translations/mirall_th.ts | 90 +++++++++++++++++++++---------
translations/mirall_tr.ts | 98 ++++++++++++++++++++++----------
translations/mirall_uk.ts | 90 +++++++++++++++++++++---------
translations/mirall_zh_CN.ts | 90 +++++++++++++++++++++---------
translations/mirall_zh_TW.ts | 90 +++++++++++++++++++++---------
29 files changed, 1901 insertions(+), 798 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 13ca635..32f8da1 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -280,80 +280,80 @@
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Aquesta sincronització eliminarà tots els fitxers a la carpeta local de sincronització '%1'.
Si vós o l'administrador heu reinicialitzat el compte en el servidor, escolliu "Mantenir fitxers". Si voleueliminar les dades, escolliu "Esborra tots els fitxers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -478,22 +478,22 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="61"/>
<source>Click to select a local folder to sync.</source>
- <translation type="unfinished"/>
+ <translation>Feu clic per seleccionar un directori local per sincronitzar.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="65"/>
<source>Enter the path to the local folder.</source>
- <translation type="unfinished"/>
+ <translation>Introduïu la ruta del directori local.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="69"/>
<source>The directory alias is a descriptive name for this sync connection.</source>
- <translation type="unfinished"/>
+ <translation>L'àlies del directori és un nom descriptiu per la connexió de ssincronització.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="98"/>
<source>No valid local folder selected!</source>
- <translation type="unfinished"/>
+ <translation>No s'ha seleccionat cap directori local vàlid!</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="103"/>
@@ -503,7 +503,7 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="127"/>
<source>The local path %1 is already an upload folder. Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>La ruta local %1 ja és n directori de pujada. Si us play, seleccioneu un altre!</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="132"/>
@@ -513,12 +513,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>El directori seleccionat és un enllaç simbòlic. Un directori ja configurat es trobat a la ruta on apunta aquest enllaç.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
<source>An already configured folder contains the currently entered folder.</source>
- <translation type="unfinished"/>
+ <translation>Un directori ja configurat conté el directori qe heu introduït.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="152"/>
@@ -561,7 +561,7 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="282"/>
<source>Failed to create the folder on %1. Please check manually.</source>
- <translation type="unfinished"/>
+ <translation>No s'ha pogut crear el directori en %1. Si us plau, comproveu-lo manualment.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="331"/>
@@ -571,7 +571,7 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="386"/>
<source>This folder is already being synced.</source>
- <translation type="unfinished"/>
+ <translation>Ja s'està sincronitzant aquest directori.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="388"/>
@@ -647,7 +647,7 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/mirall/generalsettings.ui" line="91"/>
<source>&Restart && Update</source>
- <translation type="unfinished"/>
+ <translation>&Reiniciar && Actualitzar</translation>
</message>
</context>
<context>
@@ -936,17 +936,17 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="77"/>
<source>Downloading version %1. Please wait...</source>
- <translation type="unfinished"/>
+ <translation>Descarregat la versió %1. Espeu si us play...</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="79"/>
<source>Version %1 available. Restart application to start the update.</source>
- <translation type="unfinished"/>
+ <translation>Versió %1 disponible. Reinicieu l'aplicació per començar l'actualització.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="81"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
- <translation type="unfinished"/>
+ <translation>No s'ha pogut decarregar l'actualització. Si us plau, cliqueu <a href='%1'>aqui</a>per descarregar l'actualització manualment.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="83"/>
@@ -1268,7 +1268,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
- <translation type="unfinished"/>
+ <translation>No s'ha pogut crear el directori %1</translation>
</message>
</context>
<context>
@@ -1422,7 +1422,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation type="unfinished"/>
+ <translation>Actualment no s'ha ignorat cap fitxer a causa d'errors anteriors.</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="231"/>
@@ -1523,7 +1523,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="96"/>
<source><h3>Certificate Details</h3></source>
- <translation type="unfinished"/>
+ <translation><h3>Detalls del certificat</h3></translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="99"/>
@@ -1624,13 +1624,14 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="185"/>
<source>Certificate information:</source>
- <translation type="unfinished"/>
+ <translation>Informació del certificat:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="214"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
- <translation type="unfinished"/>
+ <translation>Aquesta connexió NO és segura , ja que no està xifrada.
+</translation>
</message>
</context>
<context>
@@ -2320,43 +2321,81 @@ It is not advisable to use it.</source>
<translation>Carregat</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Eliminat</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>S'ha mogut a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Desconegut</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>baixant</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>pujant</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
@@ -2415,7 +2454,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/theme.cpp" line="78"/>
<source>Sync is paused</source>
- <translation type="unfinished"/>
+ <translation>La incronització està pausada.</translation>
</message>
</context>
</TS>
\ No newline at end of file
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 796e15f..b41a1c0 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -280,80 +280,80 @@
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Tato synchronizace by smazala všechny soubory v místní složce '%1'
Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte "Ponechat soubory". Pokud chcete místní data odstranit, zvolte "Odstranit všechny soubory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -2326,44 +2326,82 @@ Zkuste provést novou synchronizaci.
<translation>Odesláno</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Smazáno</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Přesunuto do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Neznámý</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>stahování</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>odesílání</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>mazání</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>přesouvání</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>zpracování</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 061820c..b5abb1d 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -281,80 +281,80 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner '%1' entfernen.
Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie "Dateien behalten". Wenn Sie ihre Daten löschen wollen, wählen Sie "Alle Dateien entfernen".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -363,17 +363,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1941,7 +1941,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="177"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>Vom Server getrennt</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="209"/>
@@ -2326,44 +2326,82 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Hochgeladen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Gelöscht</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Verschoben nach %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Unbekannt</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>Herunterladen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>Lade hoch</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>Lösche</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>Verschiebe</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>Vorgang läuft</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 0c461d2..aa1b110 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -280,80 +280,80 @@
<translation> %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει διαγραφεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 έχει μεταφορτωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>Το αρχείο %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Αυτός ο συγχρονισμός θα αφαιρέσει όλα τα αρχεία στον τοπικό φάκελο συγχρονισμού '%1'.
Εάν εσείς ή ο διαχειριστής σας επαναφέρατε τον λογαριασμό σας στο διακομιστή, επιλέξτε "Διατήρηση αρχείων". Εάν θέλετε να αφαιρεθούν τα δεδομένα σας, επιλέξτε "Αφαίρεση όλων των αρχείων".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -2347,44 +2347,82 @@ Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.
<translation>Καταχωρήθηκε </translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Διαγραμμένα</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Μετακινήθηκαν στο %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Άγνωστο</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>λήψη</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>μεταφόρτωση</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>διαγραφή</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>μετακίνηση</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>επεξεργασία</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index d08e51e..e2cd3ef 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -282,96 +282,96 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -2317,43 +2317,81 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
- <source>Unknown</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
+ <source>Unknown</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 04077cb..44d32df 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -280,80 +280,80 @@
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización '%1'.
Si ud. o su administrador han restablecido su cuenta en el servidor, elija "Conservar Archivos". Si desea eliminar toda su información, elija "Eliminar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1596,7 +1596,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="123"/>
<source>SHA-256:</source>
- <translation type="unfinished"/>
+ <translation>SHA-256:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="125"/>
@@ -1940,7 +1940,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="177"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>Desconectado del servidor</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="209"/>
@@ -2325,44 +2325,82 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>Subido</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Eliminado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>subiendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>eliminando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>moviendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>procesando</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 29dd177..a6d5668 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -280,80 +280,80 @@
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización borraría todos los archivos en la carpeta local de sincronización '%1'.
Si vos o el administrador resetearon tu cuenta en el servidor, elegí "Conservar Archivos". Si querés borrar toda tu información, elegí "Borrar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -2322,43 +2322,81 @@ Intente sincronizar estos nuevamente.</translation>
<translation>Subido</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Borrado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>subiendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 4d9dc77..1c5ff9f 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -280,80 +280,80 @@
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>See sünkroniseering kustutab kõik failid kohalikust kataloogist '%1'.⏎
Kui sina või adminstraator on sinu konto serveris algseadistanud, siis vali "Säilita failid". Kui soovid oma andmed kustutada, vali "Kustuta kõik failid".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -2325,44 +2325,82 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Üles laetud</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Kustutatud</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Tõstetud %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Tundmatu</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>allalaadimine</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>üleslaadimine</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>kustutan</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>liigutan</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>töötlen</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 7e29a32..bd36d8b 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -280,96 +280,96 @@
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -2318,43 +2318,81 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation>Igoa</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Ezabatuta</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>%1era mugituta</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Ezezaguna</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>deskargatzen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>igotzen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index c334b88..a08ea1e 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -280,96 +280,96 @@
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -2315,43 +2315,81 @@ It is not advisable to use it.</source>
<translation>بارگذاری شده است.</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>حذف شده</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>نامشخص</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 827f61f..27f0c3d 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -280,96 +280,96 @@
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -2319,44 +2319,82 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Lähetetty</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Poistettu</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Tuntematon</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>ladataan</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>lähetetään</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>poistetaan</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>siirretään</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>käsitellään</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index a5ff0d9..fd84ba2 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -280,80 +280,80 @@
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Cette synchronisation supprimerait tous les fichiers du dossier local de synchronisation '%1'.
Si vous-même ou votre administrateur avez réinitialisé votre compte sur le serveur, choisissez "Garder les fichiers". Si vous voulez que vos données soient supprimées, choisissez "Supprimer tous les fichiers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -2325,44 +2325,82 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Importé</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Effacé</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Déplacé vers %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Inconnu</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>téléchargement</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>téléversement</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>suppression</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>déplacement</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>traitement</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index bfc9215..1fd5bcb 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -280,80 +280,80 @@
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización retirará todos os ficheiros do cartafol local de sincronización «%1».
Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros».</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1940,7 +1940,7 @@ Tente sincronizalos de novo.</translation>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="177"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>Desconectado do servidor</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="209"/>
@@ -2325,44 +2325,82 @@ Tente sincronizalos de novo.</translation>
<translation>Enviado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Eliminado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Descoñecido</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>enviando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>eliminando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>movendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>procesando</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 4e72dd7..5c0f6a5 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -280,96 +280,96 @@
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<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="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -2315,43 +2315,81 @@ It is not advisable to use it.</source>
<translation>Feltöltve</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Törölve</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Ismeretlen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>letöltés folyamatban</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>feltöltés folyamatban</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 4e8629b..2125927 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -280,80 +280,80 @@
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale '%1'.
Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli "Mantieni i file". Se desideri che i dati siano rimossi, scegli "Rimuovi tutti i file".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -2324,44 +2324,82 @@ Prova a sincronizzare nuovamente.</translation>
<translation>Caricato</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Eliminato</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Spostato in %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Sconosciuto</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>scaricamento in corso</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>caricamento in corso</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>eliminazione</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>spostamento</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>elaborazione</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 9c00523..79b211f 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -280,80 +280,80 @@
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>この同期により、ローカルの同期フォルダー '%1'にある全ファイルが削除されます。
あなた、または管理者がサーバー上のアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -2324,43 +2324,81 @@ It is not advisable to use it.</source>
<translation>アップロード済み</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>削除済み</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>%1 へ移動完了</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>不明</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>ダウンロード中</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>アップロード中</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 46ee182..7b14d0a 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -280,80 +280,80 @@
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap '%1'.
Als u of uw beheerder uw account op de server heeft gereset, kies dan "Bewaar bestanden". Als u uw bestanden wilt verwijderen, kies dan "Verwijder alle bestanden".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -1940,7 +1940,7 @@ Probeer opnieuw te synchroniseren.</translation>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="177"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>Verbinding met server verbroken</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="209"/>
@@ -2325,44 +2325,82 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Geüpload</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Verwijderd</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Verplaatst naar %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Onbekend</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>downloaden</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>uploaden</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>verwijderen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>verplaatsen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>verwerken</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 6f8b392..bd2cf8f 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -280,80 +280,80 @@
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
Jeśli Ty lub Twój administrator zresetowali Twoje konto na serwerze, wybierz "Zachowaj pliki". Jeśli chcesz aby Twoje dane zostały usunięte, wybierz "Usuń wszystkie pliki".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -1940,7 +1940,7 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="177"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>Rozłączono z serwerem</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="209"/>
@@ -2326,44 +2326,82 @@ Kliknij</translation>
<translation>Wysłane</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Usunięte</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Przeniesione do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Nieznany</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>pobieram</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>przesyłanie</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>usuwam</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>przenoszę</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>procesuję</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 69e934c..3745408 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -280,80 +280,80 @@
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os ficheiros sincronizados na pasta local '%1'.
Se você ,ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -361,17 +361,17 @@ Are you sure you want to perform this operation?</source>
Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -2322,44 +2322,82 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Carregado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Apagado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Movido para %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>A descarregar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>A carregar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>a apagar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>a mover</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>a processar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 26172a1..c613ff9 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -280,80 +280,80 @@
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os arquivos na pasta de sincronização local '%1'.
Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha "Manter arquivos". Se você deseja que seus dados sejam removidos, escolha "Remover todos os arquivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -2323,44 +2323,82 @@ Tente sincronizar novamente.</translation>
<translation>Enviado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Excluído</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Movido para %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>baixando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>enviando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>eliminando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>movendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>processando</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 1445066..5d6468e 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -280,80 +280,80 @@
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Это действие может удалить все файлы в локальной папке '%1'.
Если вы или ваш администратор заново создали вашу учётную запись на сервере, выберите "Сохранить файлы". Если вы хотите стереть всё - выберите "Удалить все файлы".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -2327,43 +2327,81 @@ It is not advisable to use it.</source>
<translation>Загружено</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Удалён</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Перемещено в %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Неизвестно</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>скачиваю</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>загружаю на сервер</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index ab11218..0aeddd7 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -280,80 +280,80 @@
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Táto synchronizácia odstráni všetky súbory v lokálnom synchronizačnom priečinku '%1'.
Pokiaľ vy alebo váš správca zresetoval váš účet na serveri, vyberte možnosť "Ponechať súbory". Pokiaľ chcete odstrániť vaše dáta, vyberte možnosť "Odstrániť všetky súbory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -2321,43 +2321,81 @@ Nie je vhodné ju používať.</translation>
<translation>Odoslané</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Zmazané</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Presunuté do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Neznámy</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>sťahujem</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>nahrávam</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 5d2e158..42470ad 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -280,80 +280,80 @@
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Z usklajevanjem bodo odstranjene vse krajevne datoteke v mapi '%1'.
Če je bil račun na strežniku kakorkoli ponastavljen, izberite možnost "Ohrani datoteke", če pa želite datoteke res odstraniti, izberite drugo možnost.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -2325,44 +2325,82 @@ Te je treba uskladiti znova.</translation>
<translation>Poslano</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Izbrisano</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Premaknjeno v %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Neznano</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>prejemanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>pošiljanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>brisanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>premikanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>obdelava</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index e29a38c..5b99614 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -280,80 +280,80 @@
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Denna synk skulle radera alla filer i den lokala mappen '%1'.
Om systemadministratören har återställt ditt konto på servern, välj "Behåll filer". Om du vill att dina filer ska raderas, välj "Radera alla filer".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -2325,44 +2325,82 @@ Försök att synka dessa igen.</translation>
<translation>Uppladdad</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Raderad</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>Flyttad till %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Okänt</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>laddar ner</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>laddar upp</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>raderar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>flyttar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>bearbetar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 7381e1e..781d2a5 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -280,96 +280,96 @@
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -2315,43 +2315,81 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>ลบแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>ไม่ทราบ</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 30ac771..0a940e6 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -280,80 +280,80 @@
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<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="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<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="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Bu eşitleme, yerel eşitleme klasörü '%1' içindeki tüm dosyaları kaldıracak.
Eğer siz veya yöneticiniz sunucudaki hesabınızı sıfırlamışsa, "Dosyaları koru" seçin. Eğer verinizin kaldırılmasını istiyorsanız, "Tüm dosyaları kaldır" seçin.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -687,7 +687,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation>Bir kalıpla eşleşen dosya ve dizinler eşitlenmeyecektir.
-İşaretli ögeler de bir dizinin kaldırılmasını engelliyorlarsa silineceklerdir. Bu üst veri için kullanışlıdır.</translation>
+İşaretli ögeler de bir dizinin kaldırılmasını engelliyorlarsa silineceklerdir. Bu, üst veri için kullanışlıdır.</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="97"/>
@@ -1939,7 +1939,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="177"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>Sunucu bağlantısı kesildi</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="209"/>
@@ -2303,7 +2303,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
- <translation><p><small>Git gözden geçirme <a href="%1">%2</a> ile %3 tarihinde, %4 ve Qt %5 kullanılarak derlendi.</small><p></translation>
+ <translation><p><small>Git gözden geçirme <a href="%1">%2</a> ile %3, %4 tarihinde, Qt %5 kullanılarak derlendi.</small><p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
@@ -2324,44 +2324,82 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Yüklendi</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Silindi</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation>%1 konumuna taşındı</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Bilinmeyen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation>indiriliyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation>yükleniyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation>siliniyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation>taşınıyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
- <translation>işleniyor</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index c7b99f2..40ddd3f 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -280,96 +280,96 @@
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -2315,43 +2315,81 @@ It is not advisable to use it.</source>
<translation>Вивантажено</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>Видалено</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>Невідомо</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 6f3ce49..9dcc299 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -280,96 +280,96 @@
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -2315,43 +2315,81 @@ It is not advisable to use it.</source>
<translation>已上传</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>已删除</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index cde6f85..d3953cf 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -280,96 +280,96 @@
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="398"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<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="400"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="405"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<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="407"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="412"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="419"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="421"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="428"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="676"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="679"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="686"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -2315,43 +2315,81 @@ It is not advisable to use it.</source>
<translation>已上傳</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Deleted</source>
<translation>已刪除</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
<source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
+ <source>Ignored</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="45"/>
+ <source>Filesystem access error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
+ <source>Error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="49"/>
+ <source>Updated</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="55"/>
<source>Unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="67"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="70"/>
<source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
<source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
- <source>processing</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="75"/>
+ <source>ignoring</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="77"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="79"/>
+ <source>error</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="81"/>
+ <source>updating</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="84"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <source>unknown</source>
<translation type="unfinished"/>
</message>
</context>
--
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