[Pkg-owncloud-commits] [owncloud-client] 119/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:42 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 de84e8012e94ceb85f8c7f98998db3da2ef4e5c2
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Tue Mar 11 06:50:19 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 87 +++++++++++++++++++---------------
translations/mirall_cs.ts | 109 ++++++++++++++++++++++++-------------------
translations/mirall_de.ts | 87 +++++++++++++++++++---------------
translations/mirall_el.ts | 87 +++++++++++++++++++---------------
translations/mirall_en.ts | 65 +++++++++++++++-----------
translations/mirall_es.ts | 87 +++++++++++++++++++---------------
translations/mirall_es_AR.ts | 87 +++++++++++++++++++---------------
translations/mirall_et.ts | 87 +++++++++++++++++++---------------
translations/mirall_eu.ts | 81 ++++++++++++++++++--------------
translations/mirall_fa.ts | 65 +++++++++++++++-----------
translations/mirall_fi.ts | 85 ++++++++++++++++++---------------
translations/mirall_fr.ts | 97 +++++++++++++++++++++-----------------
translations/mirall_gl.ts | 87 +++++++++++++++++++---------------
translations/mirall_hu.ts | 75 ++++++++++++++++-------------
translations/mirall_it.ts | 87 +++++++++++++++++++---------------
translations/mirall_ja.ts | 87 +++++++++++++++++++---------------
translations/mirall_nl.ts | 87 +++++++++++++++++++---------------
translations/mirall_pl.ts | 87 +++++++++++++++++++---------------
translations/mirall_pt.ts | 81 ++++++++++++++++++--------------
translations/mirall_pt_BR.ts | 87 +++++++++++++++++++---------------
translations/mirall_ru.ts | 87 +++++++++++++++++++---------------
translations/mirall_sk.ts | 87 +++++++++++++++++++---------------
translations/mirall_sl.ts | 97 +++++++++++++++++++++-----------------
translations/mirall_sv.ts | 67 +++++++++++++++-----------
translations/mirall_th.ts | 65 +++++++++++++++-----------
translations/mirall_uk.ts | 65 +++++++++++++++-----------
translations/mirall_zh_CN.ts | 65 +++++++++++++++-----------
translations/mirall_zh_TW.ts | 65 +++++++++++++++-----------
translations/pofiles/tr.po | 87 +++++++++++++++++++---------------
29 files changed, 1353 insertions(+), 1034 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index fffc971..ac1923c 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -472,69 +472,80 @@
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Fitxer %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>baixat</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="370"/>
- <source>removed</source>
- <translation>eliminat</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="371"/>
- <source>updated</source>
- <translation>actualitzat</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>reanomena</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>mogut</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="381"/>
- <source>%1 to %2</source>
- <translation>%1 a %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' ha estat %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Fitxers %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' i %2 altres fitxers s'han %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 53322d1..493b95e 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -146,12 +146,12 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 (%3%) of %2 server space in use.</source>
- <translation type="unfinished"/>
+ <translation>%1 (%3%) z %2 místa na disku použito.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
- <translation type="unfinished"/>
+ <translation>Žádné spojení s %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="775"/>
@@ -224,17 +224,17 @@
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
<source>Authentication Required</source>
- <translation type="unfinished"/>
+ <translation>Ověření vyžadováno</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
<source>Enter username and password for '%1' at %2.</source>
- <translation type="unfinished"/>
+ <translation>Zadejte uživatelské jméno a heslo pro '%1' na %2.</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
<source>&User:</source>
- <translation type="unfinished"/>
+ <translation>&Uživatel:</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
@@ -472,69 +472,80 @@
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Soubor %1</translation>
+ <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="400"/>
+ <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="369"/>
- <source>downloaded</source>
- <translation>staženo</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="370"/>
- <source>removed</source>
- <translation>odstraněno</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="371"/>
- <source>updated</source>
- <translation>aktualizováno</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>přejmenováno</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>přesunuto</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="381"/>
- <source>%1 to %2</source>
- <translation>%1 do %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' byl %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Soubory %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation> '%1' a %2 dalších souborů bylo %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -1430,7 +1441,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Soubor by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation>
</message>
</context>
<context>
@@ -1454,7 +1465,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
<source>The file has been removed from a read only share. It was restored.</source>
- <translation type="unfinished"/>
+ <translation>Soubor by odebrán ze sdílení pouze pro čtení. Soubor byl obnoven.</translation>
</message>
</context>
<context>
@@ -1472,7 +1483,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
- <translation type="unfinished"/>
+ <translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
</message>
</context>
<context>
@@ -1491,7 +1502,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation type="unfinished"/>
+ <translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze jje uložena v konfliktním souboru.</translation>
</message>
</context>
<context>
@@ -1499,12 +1510,12 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation type="unfinished"/>
+ <translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze jje uložena v konfliktním souboru.</translation>
</message>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
<source>Local file changed during sync.</source>
- <translation type="unfinished"/>
+ <translation>Lokální soubor byl změněn během synchronizace.</translation>
</message>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 54db0f6..21f32fb 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -473,69 +473,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="394"/>
- <source>File %1</source>
- <translation>Datei %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>Heruntergeladen</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>Entfernt</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>Aktualisiert</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>Umbenannt</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>verschoben</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 nach %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' wurde %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Dateien %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' und %2 andere Dateien wurden %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -544,17 +555,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 140eb1d..537e308 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -472,69 +472,80 @@
<translation> %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Αρχείο %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>κατέβηκε</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="370"/>
- <source>removed</source>
- <translation>αφαιρέθηκε</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="371"/>
- <source>updated</source>
- <translation>ενημερώθηκε</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>μετονομάστηκε</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>μετακινήθηκαν</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="381"/>
- <source>%1 to %2</source>
- <translation>%1 προς %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>Το '%1' %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Αρχεία %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>Τα '%1' και άλλα %2 αρχεία %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index e7a6e52..fa96143 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -474,85 +474,96 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
+ <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="369"/>
- <source>downloaded</source>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <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="370"/>
- <source>removed</source>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <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="374"/>
- <source>renamed</source>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <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="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 157c664..9e0cd25 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -472,69 +472,80 @@
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Archivo %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>Descargado</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>eliminado</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>Actualizado</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>Renombrado</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 a %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' ha sido %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Archivos %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' y %2 otros archivos son %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 7313eab..01ff178 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -472,69 +472,80 @@
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Archivo %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>descargado</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>removido</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>actualizado</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>renombrado</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 a %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' ha sido %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Archivos %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' y %2 otros archivos han sido %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index b67cdce..f28d810 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -472,69 +472,80 @@
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Fail %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>allalaaditud</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="370"/>
- <source>removed</source>
- <translation>eemaldatud</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="371"/>
- <source>updated</source>
- <translation>uuendatud</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>ümber nimetatud</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>ümber tõstetud</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="381"/>
- <source>%1 to %2</source>
- <translation>%1 kuni %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' on olnud %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Failid %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' ja %2 teist faili on olnud %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index d6b6bbf..a45e623 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -472,85 +472,96 @@
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>%1 Fitxategia</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>deskargatuta</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>ezabatuta</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>eguneratuta</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>berrizendatuta</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>mugitua</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' '%2' izan da.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 97d9469..5b40057 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -472,85 +472,96 @@
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
- <source>downloaded</source>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index a3d8883..4344686 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -472,85 +472,96 @@
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Tiedosto %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>ladattu</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>poistettu</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="371"/>
- <source>updated</source>
- <translation>päivitetty</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>nimetty uudelleen</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>siirretty</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' on %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Tiedostot %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' ja %2 muuta tiedostoa on %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index ac5af5e..e2de0ba 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -146,7 +146,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 (%3%) of %2 server space in use.</source>
- <translation type="unfinished"/>
+ <translation>%1 (%3%) de %2 d'espace utilisé sur le serveur.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
@@ -224,17 +224,17 @@
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
<source>Authentication Required</source>
- <translation type="unfinished"/>
+ <translation>Authentification requise</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
<source>Enter username and password for '%1' at %2.</source>
- <translation type="unfinished"/>
+ <translation>Saisir le nom d'utilisateur et le mot de passe pour '%1' sur %2.</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
<source>&User:</source>
- <translation type="unfinished"/>
+ <translation>&Utilisateur :</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
@@ -472,69 +472,80 @@
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Fichier %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>téléchargé</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>supprimé</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>mis à jour</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>renommé</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>déplacé</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="381"/>
- <source>%1 to %2</source>
- <translation>%1 à %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' a été %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Fichiers %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' et %2 autres fichiers ont été %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -1504,7 +1515,7 @@ Il est déconseillé de l'utiliser.</translation>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
<source>Local file changed during sync.</source>
- <translation type="unfinished"/>
+ <translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 1b1ac45..86bf58f 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -472,69 +472,80 @@
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Ficheiro %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>descargado</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>Retirado</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>actualizado</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>renomeado</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 de %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>«%1» foi %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Ficheiros %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>«%1» e outros %2 ficheiros foron %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 9bd842c..70b0ad3 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -472,85 +472,96 @@
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
- <source>downloaded</source>
- <translation>letöltva</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>eltávolítva</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>módosítva</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>átnevezve</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>mozgatva</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index cade11e..3e44599 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -472,69 +472,80 @@
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>File %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>scaricato</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>rimosso</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>aggiornato</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>rinominato</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>spostato</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>Da %1 a %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' è stato %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>File %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' e %2 altri file sono stati %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 2b84af2..2d19c8b 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -472,69 +472,80 @@
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>ファイル %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>ダウンロード完了</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>削除</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>アップデート済</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>名前変更</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>移動</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 から %2 へ</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' は %2 です。</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>ファイル %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' と %2 個のファイルは %3 です。</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index a365982..7f07df6 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -472,69 +472,80 @@
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Bestand %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>gedownload</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>verwijderd</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>geüpdatet</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>hernoemd</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>verplaatst</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 naar %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' was %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Bestanden %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' en %2 andere bestanden waren %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 3862df0..fa2ec73 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -472,69 +472,80 @@
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Plik %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>Pobrane</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="370"/>
- <source>removed</source>
- <translation>Usunęte</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="371"/>
- <source>updated</source>
- <translation>zaktualizowane</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>Zmienione</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>przeniesione</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="381"/>
- <source>%1 to %2</source>
- <translation>%1 do %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' został %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Pliki %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' i %2 inne pliki zostały %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index d0f41c2..d72d75f 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -473,85 +473,96 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Ficheiro %1</translation>
+ <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="369"/>
- <source>downloaded</source>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>removido</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>actualizado</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>renomeado</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 para %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Ficheiros %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation>Actividade de sincronicação</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 912a328..e64b28e 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -472,69 +472,80 @@
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Arquivo %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>baixado</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>removido</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>atualizado</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>renomeado</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 para %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' foi %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Arquivos %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' e %2 outros arquivos foram %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 7c173da..3517305 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -472,69 +472,80 @@
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Файл %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>скачано</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="370"/>
- <source>removed</source>
- <translation>удалено</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="371"/>
- <source>updated</source>
- <translation>обновлено</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>переименовано</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>перемещено</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="381"/>
- <source>%1 to %2</source>
- <translation>%1 в %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>%1' был %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Файлы %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' и ещё %2 других файлов было %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index f91c9e1..1c6b8e4 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -472,69 +472,80 @@
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Súbor %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>stiahnuté</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>zmazané</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>aktualizované</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>premenované</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>presunuté</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 na %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' bol %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Súbory %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' a %2 ďalších súborov bolo %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index dda0730..32a03ae 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -151,7 +151,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
- <translation type="unfinished"/>
+ <translation>Ni povezave z %1 pri <a href="%2">%3</a>.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="775"/>
@@ -224,17 +224,17 @@
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
<source>Authentication Required</source>
- <translation type="unfinished"/>
+ <translation>Zahtevana je overitev</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
<source>Enter username and password for '%1' at %2.</source>
- <translation type="unfinished"/>
+ <translation>Vpišite uporabniško ime in geslo za '%1' pri %2.</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
<source>&User:</source>
- <translation type="unfinished"/>
+ <translation>&Uporabnik:</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
@@ -472,69 +472,80 @@
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Datoteka %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>prejeta.</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>odstranjena.</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>posodobljena.</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>preimenovana.</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>premaknjeno</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 vo %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>Datoteka '%1' je %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Datoteke %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' in %2 drugih datotek je %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -1504,7 +1515,7 @@ Uporaba ni priporočljiva.</translation>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
<source>Local file changed during sync.</source>
- <translation type="unfinished"/>
+ <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index fb15b2c..6e4d47b 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -472,69 +472,80 @@
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Fil %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
- <source>downloaded</source>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index bc484c7..cc9a62e 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -472,85 +472,96 @@
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
- <source>downloaded</source>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index ffcec51..499291d 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -472,85 +472,96 @@
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
- <source>downloaded</source>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 960e22e..e448196 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -472,85 +472,96 @@
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
- <source>downloaded</source>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index e7f1536..a2a3f00 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -472,85 +472,96 @@
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
- <source>downloaded</source>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 0979694..1b8d749 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -472,69 +472,80 @@
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
- <source>File %1</source>
- <translation>Dosya %1</translation>
+ <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="369"/>
- <source>downloaded</source>
- <translation>indirildi</translation>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
+ <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="313"/>
- <source>%1: %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/mirall/folder.cpp" line="402"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="370"/>
- <source>removed</source>
- <translation>kaldırıldı</translation>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
+ <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="371"/>
- <source>updated</source>
- <translation>güncellendi</translation>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
+ <source>%1 has been downloaded.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
- <source>renamed</source>
- <translation>adlandırıldı</translation>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
+ <source>%1 and %2 other files have been updated.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
- <source>moved</source>
- <translation>taşındı</translation>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="381"/>
- <source>%1 to %2</source>
- <translation>%1 ile %2 arası</translation>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
+ <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="394"/>
- <source>'%1' has been %2.</source>
- <translation>'%1' %2.</translation>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
+ <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="396"/>
- <source>Files %1</source>
- <translation>Dosya %1</translation>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
+ <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="397"/>
- <source>'%1' and %2 other files have been %3.</source>
- <translation>'%1' ve diğer %2 dosya %3.</translation>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
+ <source>%1 has been moved to %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="690"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<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="693"/>
+ <location filename="../src/mirall/folder.cpp" line="734"/>
<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>
@@ -543,17 +554,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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="740"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="741"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list