[Pkg-owncloud-commits] [owncloud-client] 05/26: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Dec 9 00:01:57 UTC 2013
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 206c62a171a60cba193b68b15c1d00983b036844
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Fri Nov 29 13:11:24 2013 -0500
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 118 +++++++++++++------------
translations/mirall_cs.ts | 144 ++++++++++++++++--------------
translations/mirall_de.ts | 126 ++++++++++++++-------------
translations/mirall_el.ts | 118 +++++++++++++------------
translations/mirall_en.ts | 116 +++++++++++++------------
translations/mirall_es.ts | 118 +++++++++++++------------
translations/mirall_es_AR.ts | 118 +++++++++++++------------
translations/mirall_et.ts | 120 +++++++++++++------------
translations/mirall_eu.ts | 116 +++++++++++++------------
translations/mirall_fa.ts | 118 +++++++++++++------------
translations/mirall_fi.ts | 120 +++++++++++++------------
translations/mirall_fr.ts | 154 ++++++++++++++++++---------------
translations/mirall_gl.ts | 126 ++++++++++++++-------------
translations/mirall_hu.ts | 116 +++++++++++++------------
translations/mirall_it.ts | 120 +++++++++++++------------
translations/mirall_ja.ts | 202 +++++++++++++++++++++++--------------------
translations/mirall_nl.ts | 179 ++++++++++++++++++++------------------
translations/mirall_pl.ts | 118 +++++++++++++------------
translations/mirall_pt.ts | 118 +++++++++++++------------
translations/mirall_pt_BR.ts | 126 ++++++++++++++-------------
translations/mirall_ru.ts | 118 +++++++++++++------------
translations/mirall_sk.ts | 118 +++++++++++++------------
translations/mirall_sl.ts | 118 +++++++++++++------------
translations/mirall_sv.ts | 118 +++++++++++++------------
translations/mirall_th.ts | 116 +++++++++++++------------
translations/mirall_uk.ts | 118 +++++++++++++------------
translations/mirall_zh_CN.ts | 118 +++++++++++++------------
translations/mirall_zh_TW.ts | 118 +++++++++++++------------
28 files changed, 1907 insertions(+), 1626 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index bd99731..ccd791c 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>Error inespecífic de CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Fitxer %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -537,52 +547,52 @@ Esteu segur que voleu executar aquesta operació?</translation>
<translation>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Espera per començar la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>El servidor no està disponible actualment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
@@ -1261,12 +1271,12 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1280,7 +1290,7 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1353,8 +1363,8 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Estat</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1514,117 +1524,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>No hi ha fitxers de sincronització configurats</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Cap.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Canvis recents</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Obre la carpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Fitxers gestionats:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Obre carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Obre %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Calculant la quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Estat desconegut</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Arranjament...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Detalls...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Surt %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Quota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1 de %2 en ús</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>No hi ha elements sincronitzats recentment</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Sincronitzant %1 de %2 (%3 de %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Actualitzat</translation>
</message>
@@ -1913,12 +1923,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared.</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 88c9f19..01dbafa 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -166,7 +166,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="755"/>
<source>%1 of %2 (%3%) in use.</source>
- <translation>%1 z %2 v užívání.</translation>
+ <translation>%1 z %2 (%3%) v užívání.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="786"/>
@@ -211,7 +211,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="793"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Žádné spojení s <a href="%1">%2</a>.</translation>
+ <translation>Žádné spojení k %1 v <a href="%1">%2</a>.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="759"/>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,14 +351,14 @@
<translation>Nespecifikovaná chyba CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
- <translation>Položka nebyla synchronizována, protože je na černé listině.</translation>
+ <translation>Položka není synchronizována, protože je na černé listině.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
- <translation>Nemohu inicializovat synchronizační list.</translation>
+ <translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="149"/>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Soubor %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation>aktualizováno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation>přejmenováno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation>'%1' byl %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation>Soubory %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation> '%1' a %2 dalších souborů bylo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -537,52 +547,52 @@ Opravdu chcete provést tuto akci?</translation>
<translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Vyčkává na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Server je nyní nedostupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
@@ -642,12 +652,12 @@ dokumentací pro možnost opravy.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="121"/>
<source>The local path %1 is already an upload folder. Please pick another one!</source>
- <translation>Cesta %1 je již nastavena jako adresář pro odesílání.<br/>Zvolte, prosím, jinou!</translation>
+ <translation>Místní cesta %1 je již nastavena jako složka pro odesílání. Zvolte, prosím, jinou!</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="133"/>
<source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source>
- <translation>Označená složka je symbolický odkaz. Cílová složka tohoto odkazu již obsahuje nastavenou složku. </translation>
+ <translation>Zvolená složka je symbolický odkaz. Cílová složka tohoto odkazu již obsahuje nastavenou složku. </translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="140"/>
@@ -700,7 +710,7 @@ dokumentací pro možnost opravy.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="264"/>
<source>Failed to create the folder on %1. Please check manually.</source>
- <translation>Na %1 selhalo vytvoření složky. Zkontrolujte to, prosím ručně.</translation>
+ <translation>Na %1 selhalo vytvoření složky. Zkontrolujte to, prosím, ručně.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="368"/>
@@ -710,7 +720,7 @@ dokumentací pro možnost opravy.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="374"/>
<source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
- <translation>Již synchronizujete všechny vaše soubory. Synchroniyování další složky <b>není</b> podporováno. Pokud chcete synchronizovat více složek, tak odstraňte, prosím, synchronizaci kořenové složky.</translation>
+ <translation>Již synchronizujete všechny vaše soubory. Synchronizování další složky <b>není</b> podporováno. Pokud chcete synchronizovat více složek, odstraňte, prosím, synchronizaci aktuální kořenové složky.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="313"/>
@@ -1161,7 +1171,7 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="264"/>
<source>No remote folder specified!</source>
- <translation>Žádná vzdálená složka nenastavena.</translation>
+ <translation>Žádná vzdálená složka nenastavena!</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="270"/>
@@ -1261,12 +1271,12 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Lokální soubor byl změněn během synchronizace, bude synchronizán, jakmile bude kompletní</translation>
+ <translation>Místní soubor byl změněn během synchronizace, bude sesynchronizán, jakmile bude kompletní</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
@@ -1280,8 +1290,8 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
- <translation>Podrobný protokol synchronizace</translation>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1331,7 +1341,7 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="126"/>
<source>The sync status has been copied to the clipboard.</source>
- <translation>Protokol synchronizace byl zkopírován do schránky.</translation>
+ <translation>Stav synchronizace byl zkopírován do schránky.</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="177"/>
@@ -1353,8 +1363,8 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Stav</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1515,117 +1525,117 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Přihlašte se prosím</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Složka %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nejsou nastaveny žádné synchronizované složky.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nic.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Poslední změny</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Otevřít složku %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Spravované složky:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Otevřít složku '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Počítám kvóty...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Neznámý stav</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Nastavení...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Podrobnosti...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Ukončit %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation>Přihlásit...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation>Odhlásit</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Kvóta nedostupná</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 v používání</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Žádné položky nebyly nedávno synchronizovány</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synchronizuji %1 z %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
@@ -1900,7 +1910,7 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="197"/>
<source>could not create directory %1</source>
- <translation>nepodařilo se vytvořit složku %1</translation>
+ <translation>nepodařilo se vytvořit adresář %1</translation>
</message>
</context>
<context>
@@ -1914,12 +1924,12 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index d80bc91..dd43f70 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -223,9 +223,9 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
- <translation type="unfinished"/>
+ <translation>Verbindung fehlgeschlagen</translation>
</message>
</context>
<context>
@@ -352,12 +352,12 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>CSync unbekannter Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation>Das Element wurde nicht synchronisiert, da es auf der schwarzen Liste steht.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
@@ -379,7 +379,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<message>
<location filename="../src/mirall/csyncthread.cpp" line="161"/>
<source>CSync failed to access </source>
- <translation type="unfinished"/>
+ <translation>CSync-Zugriff fehlgeschlagen</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="176"/>
@@ -449,7 +449,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Datei %1</translation>
</message>
@@ -469,39 +469,49 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Aktualisiert</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation>Umbenannt</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation>'%1' wurde %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation>Dateien %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' und %2 andere Dateien wurden %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -510,17 +520,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -538,52 +548,52 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Der Server ist momentan nicht erreichbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Setup-Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
@@ -1262,12 +1272,12 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert, synchronisieren Sie nochmals sobald die aktuelle Datei vollständig angekommen ist</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
</message>
@@ -1281,8 +1291,8 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
- <translation>Detaillierter Synchronisationsstatus</translation>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1354,8 +1364,8 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Status</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1516,117 +1526,117 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Bitte melden Sie sich an</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Ordner %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Keine Sync-Ordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Keine.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Letzte Änderungen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Ordner %1 öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Verwaltete Ordner:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Ordner '%1' öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Berechne Quote...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Unbekannter Status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Details...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation>Anmeldung...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation>Abmeldung</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Quote unbekannt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% von %2 benutzt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Keine kürzlich synchronisierten Elemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synchronisiere %1 von %2 (%3 von %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
@@ -1915,12 +1925,12 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe.</translation>
</message>
@@ -2115,7 +2125,7 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
<source>Sync Error</source>
- <translation type="unfinished"/>
+ <translation>Synchronisationsfehler</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="66"/>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index d8d6a96..892b4c0 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync αγνωστο σφαλμα.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Αρχείο %1</translation>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη κατάσταση.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμούς)</translation>
</message>
@@ -1258,12 +1268,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1277,7 +1287,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1350,8 +1360,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Κατάσταση</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1511,117 +1521,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Φάκελος %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Πρόσφατες Αλλαγές</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Άνοιγμα %1 φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Διαχείριση αρχείων:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Άνοιγμα καταλόγου '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Υπολογισμός μεριδίου χώρου αποθήκευσης...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Άγνωστη κατάσταση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Ρυθμίσεις...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Λεπτομέρειες...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Βοήθεια</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Κλείσιμο %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Μερίδιο χώρου αποθήκευσης δεν είναι διαθέσιμο</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Συγχρονισμός %1 από %2 (%3 από %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
@@ -1910,12 +1920,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index af90cfd..5037268 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -224,7 +224,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"></translation>
</message>
@@ -353,12 +353,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
@@ -450,7 +450,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"></translation>
</message>
@@ -470,55 +470,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -536,52 +546,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -1256,12 +1266,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
@@ -1275,7 +1285,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1348,7 +1358,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
+ <source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1509,117 +1519,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation type="unfinished"></translation>
</message>
@@ -1908,12 +1918,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 0568045..c81e52d 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Archivo %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -537,52 +547,52 @@ Está seguro de que desea realizar esta operación?</translation>
<translation>Una antigua jornada sincronizada '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Esperando el inicio de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>El servidor no está disponible en el momento</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronización fue exitosa pero con advertencias para archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -1261,12 +1271,12 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1280,7 +1290,7 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1353,8 +1363,8 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Estado</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1514,117 +1524,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>No hay carpetas de sincronización configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Ninguno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir carpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Carpetas administradas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Calculando cuota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Salir de %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Cuota no disponible</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>No se han sincronizado elementos recientemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Sincronizando %1 de %2 (%3 de %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -1913,12 +1923,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida.</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 1edb2a6..94050ee 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Archivo %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -537,52 +547,52 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Esperando el comienzo de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>El servidor actualmente no está disponible.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -1259,12 +1269,12 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1278,7 +1288,7 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1351,8 +1361,8 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Estado</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1512,117 +1522,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Directorio %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Los directorios de sincronización no están configurados.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Ninguno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir directorio %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Directorios administrados:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Calculando cuota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Cancelar %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Cuota no disponible</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>No se sincronizaron elementos recientemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Sincronizando %1 de %2 (%3 de %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>actualizado</translation>
</message>
@@ -1912,12 +1922,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 91ab326..fea91b5 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync tuvastamatu viga.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Fail %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation>uuendatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation>ümber nimetatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation>'%1' on olnud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation>Failid %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' ja %2 teist faili on olnud %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Viga</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -537,52 +547,52 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Ootab sünkroniseerimise alustamist.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Server pole hetkel saadaval.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
@@ -1261,12 +1271,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1280,8 +1290,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
- <translation>Täpsem sünkroniseeringu staatus</translation>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1353,8 +1363,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Staatus</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1515,117 +1525,117 @@ Palun veendu, et võrguühendus toimib.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Kaust %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Pole.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Hiljutised muudatused</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Ava kaust %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Hallatavad kaustad:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Ava kaust '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Ava %1 veebilehitsejas</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Mahupiiri arvutamine...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Tundmatu staatus</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Seaded...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Üksikasjad...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Abiinfo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Lõpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Mahupiir n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>Kasutusel %1% / %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Sünkroniseerin %1 / %2 (%3 / %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
@@ -1914,12 +1924,12 @@ Palun veendu, et võrguühendus toimib.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared.</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 1ba8188..082d63a 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSyncen zehaztugabeko errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Errorea</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,7 +1356,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
+ <source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Ez dago sinkronizazio karpetarik definituta.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Ireki %1 karpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Kudeatutako karpetak:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Laguntza</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Eguneratua</translation>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index df42216..64763ab 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>خطای نامشخص CSync </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>صبر کنید تا همگام سازی آغاز شود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,8 +1356,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>وضعیت</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>پوشه %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>هیچ پوشه ای همگام سازی شدهای تنظیم نشده است</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>بازکردن %1 پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>پوشه های مدیریت شده:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>راهنما</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 3fd5862..08866ba 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -85,7 +85,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="52"/>
<source>Connected with <server> as <user></source>
- <translation type="unfinished"/>
+ <translation>Yhdistetty palvelimeen <server> käyttäen <user> tunnusta</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="71"/>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync - määrittämätön virhe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Tiedosto %1</translation>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Virhe</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Odottaa synkronoinnin alkamista.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Palvelin ei ole käytettävissä.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,8 +1356,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Tila</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Kansio %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Synkronointikansioita ei ole määritetty.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Viimeisimmät muutokset</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Avaa %1-kansio</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Hallitut kansiot:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Avaa kansio '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Avaa %1 selaimeen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Tuntematon tila</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Asetukset...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Tiedot...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Ohje</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Lopeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1%/%2 käytössä</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Kohteita ei ole synkronoitu äskettäin</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synkronoidaan %1/%2 (%3/%4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Ajan tasalla</translation>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 077e6ae..ce52c60 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -80,7 +80,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="46"/>
<source>Account to Synchronize</source>
- <translation type="unfinished"/>
+ <translation>Compte à synchroniser</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="52"/>
@@ -222,9 +222,9 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
- <translation type="unfinished"/>
+ <translation>Échec de la connexion</translation>
</message>
</context>
<context>
@@ -351,12 +351,12 @@
<translation>Erreur CSync inconnue.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
- <translation type="unfinished"/>
+ <translation>Cet élément n’est pas synchronisé parce qu'il est sur la liste noire</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Fichier %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation>mis à jour</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation>renommé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation>'%1' a été %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation>Fichiers %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' et %2 autres fichiers ont été %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -537,52 +547,52 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Le serveur est indisponible actuellement.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Dernière synchronisation effectuée avec succès</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
@@ -632,7 +642,7 @@ documentation pour des corrections éventuelles.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="92"/>
<source>No valid local folder selected!</source>
- <translation type="unfinished"/>
+ <translation>Aucun dossier valide sélectionné !</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="97"/>
@@ -642,7 +652,7 @@ documentation pour des corrections éventuelles.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="121"/>
<source>The local path %1 is already an upload folder. Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>Le chemin d'accès local %1 est déjà un dossier de téléchargement. Veuillez en choisir un autre !</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="133"/>
@@ -662,7 +672,7 @@ documentation pour des corrections éventuelles.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="170"/>
<source>The alias <i>%1</i> is already in use. Please pick another alias.</source>
- <translation type="unfinished"/>
+ <translation>L'alias <i>%1</i> est déja utilisé. Veuillez choisir un autre alias.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="126"/>
@@ -700,12 +710,12 @@ documentation pour des corrections éventuelles.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="264"/>
<source>Failed to create the folder on %1. Please check manually.</source>
- <translation type="unfinished"/>
+ <translation>Échec à la création du dossier sur %1. Veuillez vérifier manuellement.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="368"/>
<source>This folder is already being synced.</source>
- <translation type="unfinished"/>
+ <translation>Ce dossier est déjà en cours de synchronisation.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="374"/>
@@ -729,7 +739,7 @@ documentation pour des corrections éventuelles.</translation>
<location filename="../src/mirall/folderwizard.cpp" line="43"/>
<location filename="../src/mirall/folderwizard.cpp" line="45"/>
<source><b>Warning:</b> </source>
- <translation type="unfinished"/>
+ <translation><b>Attention :</b> </translation>
</message>
</context>
<context>
@@ -771,12 +781,12 @@ documentation pour des corrections éventuelles.</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="241"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Entrez le mot de passe</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="242"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
</message>
</context>
<context>
@@ -1261,14 +1271,14 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Fichier local modifié pendant la synchronisation, la synchronisation redémarrera lorsque ce sera terminé</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
- <translation type="unfinished"/>
+ <translation>La synchronisation a été interrompue par l'utilisateur.</translation>
</message>
</context>
<context>
@@ -1280,8 +1290,8 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
- <translation>Statut de synchronisation détaillé</translation>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1353,8 +1363,8 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>État</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1480,7 +1490,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
<source>%1: %2</source>
- <translation type="unfinished"/>
+ <translation>%1: %2</translation>
</message>
</context>
<context>
@@ -1514,117 +1524,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
- <translation type="unfinished"/>
+ <translation>Veuillez vous connecter</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Dossier %1 : %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Aucun répertoire synchronisé n'est configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Aucun.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Modifications récentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Ouvrir le répertoire %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Répertoires suivis :</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Ouvrir le dossier '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Calcul du quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Statut inconnu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Paramètres...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Détails...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Quitter %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
- <translation type="unfinished"/>
+ <translation>Se connecter...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
- <translation type="unfinished"/>
+ <translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Quota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 occupés</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Aucun item synchronisé récemment</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synchronisation %1 de %2 (%3 de %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
@@ -1913,12 +1923,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Ce dossier ne doit pas être renommé. Veuillez le nommer Partagé uniquement.</translation>
</message>
@@ -2113,7 +2123,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
<source>Sync Error</source>
- <translation type="unfinished"/>
+ <translation>Erreur de synchronisation</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="66"/>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 39f0961..33847ba 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -222,9 +222,9 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
- <translation type="unfinished"/>
+ <translation>Produciuse un fallo de conexión</translation>
</message>
</context>
<context>
@@ -351,12 +351,12 @@
<translation>Produciuse un erro non especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation>O elemento non está sincronizado, xa que está na lista negra.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
@@ -378,7 +378,7 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="161"/>
<source>CSync failed to access </source>
- <translation type="unfinished"/>
+ <translation>Produciuse un fallo ao acceder a CSync</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="176"/>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Ficheiro %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation>actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation>renomeado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation>«%1» foi %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation>Ficheiros %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>«%1» e outros %2 ficheiros foron %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -537,52 +547,52 @@ Confirma que quere realizar esta operación?</translation>
<translation>Atopouse un diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Agardando polo comezo da sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>O servidor non está dispoñíbel actualmente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
@@ -1261,12 +1271,12 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>O ficheiro local cambiou durante a sincronización, sincronizando unha vez quedou completado</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation>A sincronización foi interrompida polo usuario.</translation>
</message>
@@ -1280,8 +1290,8 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
- <translation>Estado detallado da sincronización</translation>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1353,8 +1363,8 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Estado</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1515,117 +1525,117 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Ten que rexistrarse</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Cartafol %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Non se configuraron cartafoles de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Cambios recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir o cartafol %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Cartafoles xestionados:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir o cartafol «%1»</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Calculando a cota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Estado descoñecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Axustes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Axuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Saír de %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation>Rexistrarse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation>Saír</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Cota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>Usado %1% de %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Non hai elementos sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Sincronizando %1 de %2 (%3 de %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -1914,12 +1924,12 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido.</translation>
</message>
@@ -2114,7 +2124,7 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
<source>Sync Error</source>
- <translation type="unfinished"/>
+ <translation>Produciuse un erro de sincronización</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="66"/>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 1364262..5a151f7 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync ismeretlen hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<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="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>A kiszolgáló jelenleg nem érhető el.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,7 +1356,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
+ <source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Mappa %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nincsenek megadva szinkronizálandó mappák.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Legutóbbi változások</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>%1 mappa megnyitása</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Kezelt mappák:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Kvóta kiszámítása...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Ismeretlen állapot</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Beállítások...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Részletek...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Súgó</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Kvóta n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Frissítve</translation>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 3a81559..734ea42 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>Errore non specificato di CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation>Questo oggetto non è stato sincronizzato perché è sulla lista nera.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare registro di sincronizzazione.</translation>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>File %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation>aggiornato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation>rinominato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation>'%1' è stato %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation>File %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' e %2 altri file sono stati %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -537,52 +547,52 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<translation>È stato trovato un vecchio diario di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Attende l'inizio della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Il server è attualmente non disponibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stato completata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
@@ -1261,12 +1271,12 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Un file locale è cambiato durante la sincronizzazione, riprovare più avanti.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
@@ -1280,8 +1290,8 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
- <translation>Stato di sincronizzazione dettagliato</translation>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1353,8 +1363,8 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Stato</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1515,117 +1525,117 @@ Assicurati che la tua connessione sia funzionante.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Per favore accedi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Cartella %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nessuna cartella configurata per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nessuna.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Modifiche recenti</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Apri la cartella %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Cartelle gestite:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Apri la cartella '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Calcolo quota in corso...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Stato sconosciuto</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Impostazioni...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Dettagli...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Aiuto</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Esci da %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation>Accedi...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Quota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% di %2 utilizzati</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Nessun elemento sincronizzato di recente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Sincronizzazione di %1 di %2 (%3 di %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
@@ -1914,12 +1924,12 @@ Assicurati che la tua connessione sia funzionante.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominato. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Questa cartella non può essere rinominata. Ripristina il nome Shared.</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index f3297b7..369a31d 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -80,7 +80,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="46"/>
<source>Account to Synchronize</source>
- <translation type="unfinished"/>
+ <translation>同期するアカウント</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="52"/>
@@ -156,7 +156,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="102"/>
<source>No account configured.</source>
- <translation type="unfinished"/>
+ <translation>アカウントが未設定です。</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="426"/>
@@ -166,7 +166,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="755"/>
<source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
+ <translation>%1 / %2 (%3%) を使用中。</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="786"/>
@@ -206,12 +206,12 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="789"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
- <translation type="unfinished"/>
+ <translation> <a href="%1">%2</a> に <i>%3</i> として接続。</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="793"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
+ <translation>No connection to %1 at <a href="%1">%2</a>.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="759"/>
@@ -222,9 +222,9 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
- <translation type="unfinished"/>
+ <translation>接続に失敗</translation>
</message>
</context>
<context>
@@ -351,14 +351,14 @@
<translation>CSyncの未指定のエラーです。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
- <translation type="unfinished"/>
+ <translation>そのアイテムはブラックリストに該当するため同期されません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
+ <translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="149"/>
@@ -378,7 +378,7 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="161"/>
<source>CSync failed to access </source>
- <translation type="unfinished"/>
+ <translation>CSync はアクセスに失敗しました</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="176"/>
@@ -396,7 +396,7 @@
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
<source>No ownCloud account configured</source>
- <translation type="unfinished"/>
+ <translation>ownCloud アカウントが設定されていません</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
@@ -448,59 +448,69 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>ファイル %1</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="386"/>
<source>downloaded</source>
- <translation type="unfinished"/>
+ <translation>ダウンロード完了</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="387"/>
<source>removed</source>
- <translation type="unfinished"/>
+ <translation>削除</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="388"/>
<source>updated</source>
- <translation type="unfinished"/>
+ <translation>更新</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
+ <translation>名前変更</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
- <source>'%1' has been %2.</source>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
+ <source>'%1' has been %2.</source>
+ <translation>'%1' は %2 です。</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
- <translation type="unfinished"/>
+ <translation>ファイル %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
- <translation type="unfinished"/>
+ <translation>'%1' と %2 個のファイルは %3 です。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -537,52 +547,52 @@ Are you sure you want to perform this operation?</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除出来ませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>サーバは現在利用できません。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>ユーザによる中止。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
@@ -632,7 +642,7 @@ documentation for possible fixes.</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="92"/>
<source>No valid local folder selected!</source>
- <translation type="unfinished"/>
+ <translation>有効なローカルフォルダが選択されていません！</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="97"/>
@@ -662,7 +672,7 @@ documentation for possible fixes.</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="170"/>
<source>The alias <i>%1</i> is already in use. Please pick another alias.</source>
- <translation type="unfinished"/>
+ <translation>エイリアス <i>%1</i> はすでに使われています。他のエイリアスを選択してください。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="126"/>
@@ -700,12 +710,12 @@ documentation for possible fixes.</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="264"/>
<source>Failed to create the folder on %1. Please check manually.</source>
- <translation type="unfinished"/>
+ <translation>%1 にフォルダを作成できませんでした。手作業で確認してください。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="368"/>
<source>This folder is already being synced.</source>
- <translation type="unfinished"/>
+ <translation>このフォルダはすでに同期されています。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="374"/>
@@ -729,7 +739,7 @@ documentation for possible fixes.</source>
<location filename="../src/mirall/folderwizard.cpp" line="43"/>
<location filename="../src/mirall/folderwizard.cpp" line="45"/>
<source><b>Warning:</b> </source>
- <translation type="unfinished"/>
+ <translation><b>警告:</b> </translation>
</message>
</context>
<context>
@@ -742,7 +752,7 @@ documentation for possible fixes.</source>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
<source>General Setttings</source>
- <translation type="unfinished"/>
+ <translation>一般設定</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -771,12 +781,12 @@ documentation for possible fixes.</source>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="241"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>パスワードを入力してください</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="242"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>ユーザ '%2' の %1 パスワードを入力してください:</translation>
</message>
</context>
<context>
@@ -801,9 +811,9 @@ documentation for possible fixes.</source>
<source>Files or directories matching a pattern will not be synchronized.
Checked items will also be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
- <translation>ファイルやディレクトリでパターンにマッチするものは、同期されません。
+ <translation>パターンに一致するファイルやディレクトリは同期されません。
-パターンが、ディレクトリを取り除くを防ぐ場合、チェックされたアイテムも削除されます。これはメタデータ用に有効です。</translation>
+パターンによってディレクトリを削除から除外する場合は，選択された項目も削除されます。これはメタデータでの利用において有用な機能です。</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="97"/>
@@ -1156,12 +1166,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
- <translation type="unfinished"/>
+ <translation>%2 の %1 に接続に失敗:<br/>%3</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="264"/>
<source>No remote folder specified!</source>
- <translation type="unfinished"/>
+ <translation>リモートフォルダが指定されていません！</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="270"/>
@@ -1261,14 +1271,14 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
- <translation type="unfinished"/>
+ <translation>同期はユーザによって中止されました。</translation>
</message>
</context>
<context>
@@ -1280,7 +1290,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1331,7 +1341,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="126"/>
<source>The sync status has been copied to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>同期状況をクリップボードにコピーしました。</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="177"/>
@@ -1353,8 +1363,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>状態</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1377,17 +1387,17 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
<source>%1 - Authenticate</source>
- <translation type="unfinished"/>
+ <translation>%1 - 認証</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
<source>%1 - %2</source>
- <translation type="unfinished"/>
+ <translation>%1 - %2</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
<source>Error loading IdP login page</source>
- <translation type="unfinished"/>
+ <translation>IdP ログインページの読み込みエラー</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
@@ -1480,7 +1490,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
<source>%1: %2</source>
- <translation type="unfinished"/>
+ <translation>%1: %2</translation>
</message>
</context>
<context>
@@ -1514,117 +1524,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
- <translation type="unfinished"/>
+ <translation>サインインしてください</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>フォルダ %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>同期フォルダが設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>なし</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>最近変更されたファイル</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>%1 フォルダを開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>管理フォルダ:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>フォルダ ’%1’ を開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>%1 をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>制限容量を計算中...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>不明な状態</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>詳細...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>ヘルプ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
- <translation type="unfinished"/>
+ <translation>サインイン...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
- <translation type="unfinished"/>
+ <translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>クオータ n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%2 のうち %1% を使用中</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>最近同期されたアイテムはありません。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>%2 の %1 (%4 分の %3) を同期中</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>最近です</translation>
</message>
@@ -1899,7 +1909,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="197"/>
<source>could not create directory %1</source>
- <translation type="unfinished"/>
+ <translation>ディレクトリ %1 を作成できませんでした</translation>
</message>
</context>
<context>
@@ -1913,12 +1923,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダの名前の変更はできません。変更したとしても、元の名前に戻ります。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダの名前の変更はできません。名前を Shared に戻してください。</translation>
</message>
@@ -2036,7 +2046,7 @@ Please ensure that your network connection is working.</source>
<location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
<location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>Move</source>
- <translation type="unfinished"/>
+ <translation>移動</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
@@ -2075,12 +2085,12 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
<source>move</source>
- <translation type="unfinished"/>
+ <translation>移動</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
<source>moved</source>
- <translation type="unfinished"/>
+ <translation>移動</translation>
</message>
</context>
<context>
@@ -2113,7 +2123,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
<source>Sync Error</source>
- <translation type="unfinished"/>
+ <translation>同期エラー</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="66"/>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 0f8ccfc..88ec858 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -156,7 +156,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="102"/>
<source>No account configured.</source>
- <translation type="unfinished"/>
+ <translation>Geen account ingesteld.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="426"/>
@@ -222,9 +222,9 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
- <translation type="unfinished"/>
+ <translation>Verbinding mislukt</translation>
</message>
</context>
<context>
@@ -351,14 +351,14 @@
<translation>CSync ongedefinieerde fout.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
- <translation type="unfinished"/>
+ <translation>Dit item is niet gesynchroniseerd omdat het op de zwarte lijst staat.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
+ <translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="149"/>
@@ -378,7 +378,7 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="161"/>
<source>CSync failed to access </source>
- <translation type="unfinished"/>
+ <translation>CSync kreeg geen toegang</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="176"/>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Bestand %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation>geüpdatet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation>hernoemd</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation>'%1' was %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation>Bestanden %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' en %2 andere bestanden waren %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,17 @@ Dit kan komen doordat de folder ongemerkt gereconfigureerd is of doordat alle be
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -537,52 +547,52 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>De server is nu niet beschikbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was succesvol.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
@@ -642,27 +652,27 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="121"/>
<source>The local path %1 is already an upload folder. Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>Het lokale pad %1 is al een uploadfolder. Kies een andere.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="133"/>
<source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>De gekozen folder is een symbolic link. De map waarnaar deze link verwijst bevat een reeds geconfigureerde map.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="140"/>
<source>An already configured folder contains the currently entered folder.</source>
- <translation type="unfinished"/>
+ <translation>Een reeds geconfigureerde map bevat de nu ingevoerde map.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
<source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>De gekozen folder is een symbolic link. Een reeds geconfigureerde map is de bovenliggende map van de gekozen map, waarnaar de link verwijst.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="170"/>
<source>The alias <i>%1</i> is already in use. Please pick another alias.</source>
- <translation type="unfinished"/>
+ <translation>De alias <i>%1</i> is al in gebruik. Kies een andere.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="126"/>
@@ -700,7 +710,7 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="264"/>
<source>Failed to create the folder on %1. Please check manually.</source>
- <translation type="unfinished"/>
+ <translation>Aanmaken van de map op %1 mislukt.<br/>Controleer handmatig.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="368"/>
@@ -710,7 +720,7 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="374"/>
<source>You are already syncing all your files. Syncing another folder is <b>not</b> supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
- <translation type="unfinished"/>
+ <translation>U bent al uw bestanden al aan het synchroniseren.Het synchroniseren van een andere map wordt <b>niet</b> ondersteund. Als u meerdere mappen wilt synchroniseren moet u de nu geconfigureerde synchronisatie hoofdmap verwijderen.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="313"/>
@@ -729,7 +739,7 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation>
<location filename="../src/mirall/folderwizard.cpp" line="43"/>
<location filename="../src/mirall/folderwizard.cpp" line="45"/>
<source><b>Warning:</b> </source>
- <translation type="unfinished"/>
+ <translation><b>waarschuwing:</b> </translation>
</message>
</context>
<context>
@@ -771,12 +781,12 @@ werken. Controleer de de documentatie voor mogelijke oplossingen.</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="241"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Vul het wachtwoord in</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="242"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
</message>
</context>
<context>
@@ -1156,12 +1166,12 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
- <translation type="unfinished"/>
+ <translation>Kon geen verbinding maken met %1 op %2:<br/>%3</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="264"/>
<source>No remote folder specified!</source>
- <translation type="unfinished"/>
+ <translation>Geen externe map opgegeven!</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="270"/>
@@ -1261,12 +1271,12 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
+ <translation>Een lokaal bestand is gewijzigd tijdens het synchroniseren, wordt gesynchroniseerd als het volledig is aangekomen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
@@ -1280,7 +1290,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1331,7 +1341,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="126"/>
<source>The sync status has been copied to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Het synchronisatie overzicht is gekopieerd naar het klembord.</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="177"/>
@@ -1353,8 +1363,8 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Status</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1377,7 +1387,7 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
<source>%1 - Authenticate</source>
- <translation type="unfinished"/>
+ <translation>%1 - authenticeren</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
@@ -1387,13 +1397,14 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
<source>Error loading IdP login page</source>
- <translation type="unfinished"/>
+ <translation>Fout bij het laden van IdP login pagina</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
- <translation type="unfinished"/>
+ <translation>Kon de Shibboleth loginpagina niet laden om u in te loggen.
+Controleer de werking van uw netwerkverbinding.</translation>
</message>
</context>
<context>
@@ -1480,7 +1491,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
<source>%1: %2</source>
- <translation type="unfinished"/>
+ <translation>%1: %2</translation>
</message>
</context>
<context>
@@ -1514,117 +1525,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
- <translation type="unfinished"/>
+ <translation>Log alstublieft in</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Map %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Geen synchronisatie-mappen geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Geen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Recente wijzigingen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Open %1 map</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Beheerde mappen:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Open map '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Quota worden berekend ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Onbekende status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Instellingen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Details ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Help</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>%1 afsluiten</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
- <translation type="unfinished"/>
+ <translation>Inloggen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
- <translation type="unfinished"/>
+ <translation>Uitloggen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Quota niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% van %2 gebruikt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Recent niets gesynchroniseerd</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synchroniseert %1 van %2 (%3 van %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
@@ -1913,12 +1924,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld.</translation>
</message>
@@ -2036,7 +2047,7 @@ Please ensure that your network connection is working.</source>
<location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
<location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
<source>Move</source>
- <translation type="unfinished"/>
+ <translation>verplaatsen</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
@@ -2075,12 +2086,12 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
<source>move</source>
- <translation type="unfinished"/>
+ <translation>verplaatsen</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
<source>moved</source>
- <translation type="unfinished"/>
+ <translation>verplaatst</translation>
</message>
</context>
<context>
@@ -2113,7 +2124,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
<source>Sync Error</source>
- <translation type="unfinished"/>
+ <translation>Synchronisatie fout</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="66"/>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index d6ff620..24b16ce 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>Nieokreślony błąd CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Plik %1</translation>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Czekają na uruchomienie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Serwer jest obecnie niedostępny.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,8 +1356,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Status</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Folder %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nie skonfigurowano synchronizowanych folderów.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Brak.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Ostatnie zmiany</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Otwórz folder %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Zarządzane foldery:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Otwórz katalog '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Obliczam quote...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Nieznany status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Ustawienia...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Szczegóły...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Wyjdź %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Quota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 w użyciu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Brak ostatnich synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synchronizacja %1 z %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
@@ -1907,12 +1917,12 @@ Kliknij</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 93a4b9f..43771da 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -352,12 +352,12 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>CSync: erro não especificado</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -449,7 +449,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
@@ -469,55 +469,65 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -535,52 +545,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>A aguardar o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>A sincronização está a correr.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi efectuada com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1255,12 +1265,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1274,7 +1284,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1347,8 +1357,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Estado</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1508,117 +1518,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nenhuma pasta de sincronização configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir a pasta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Pastas Geridas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -1907,12 +1917,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 724a39a..e4a7c99 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -222,9 +222,9 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
- <translation type="unfinished"/>
+ <translation>Conexão falhou</translation>
</message>
</context>
<context>
@@ -351,12 +351,12 @@
<translation>Erro não especificado no CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation>O item não está sincronizador porque está na lista negra.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
@@ -378,7 +378,7 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="161"/>
<source>CSync failed to access </source>
- <translation type="unfinished"/>
+ <translation>Falha no acesso CSync</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="176"/>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Arquivo %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation>atualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation>renomeado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation>'%1' foi %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation>Arquivos %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' e %2 outros arquivos foram %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -537,52 +547,52 @@ Você tem certeza que quer executar esta operação?</translation>
<translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Aguardando o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Servidor indisponível no momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Erro de configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Usuário Abortou</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
@@ -1260,12 +1270,12 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Arquivo local alterado durante a sincronização, sincronizando uma vez que chegou completamente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi abortada pelo usuário.</translation>
</message>
@@ -1279,8 +1289,8 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
- <translation>Detalhe do Status de Sincronização</translation>
+ <source>Sync Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1352,8 +1362,8 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Status</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1514,117 +1524,117 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation>Favor conectar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Pastas de sincronização não configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Nenhum.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Alterações Recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Abrir pasta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Pastas Gerenciadas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Calculando cota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Status desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Sair %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation>Conectar em...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Cota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 em uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Não há itens sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Sincronizando %1 de %2 (%3 de %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
@@ -1913,12 +1923,12 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ele será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada.</translation>
</message>
@@ -2113,7 +2123,7 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
<source>Sync Error</source>
- <translation type="unfinished"/>
+ <translation>Erro de sincronização</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="66"/>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 0da3bcd..8868773 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>Неизвестная ошибка CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Файл %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -537,52 +547,52 @@ Are you sure you want to perform this operation?</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Ожидает, чтобы начать синхронизацию.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Сервер недоступен.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
@@ -1261,12 +1271,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1280,7 +1290,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1353,8 +1363,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Статус</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1514,117 +1524,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Папка %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Нет папок для синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Пусто</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Недавние изменения</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Открыть %1 папку</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Управляемые папки:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Открыть папку '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Расчёт квоты...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Неизвестный статус</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Настройки...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Детали...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Помощь</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Выход %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Квота недоступна</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>Используется %1% из %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Недавно ничего не синхронизировалсь</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Синхронизируются %1 из %2 (%3 из %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
@@ -1913,12 +1923,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index c190952..a8f81c4 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync nešpecifikovaná chyba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Súbor %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -537,52 +547,52 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Čakanie na štart synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Sever momentálne nie je prístupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Zrušenie používateľom</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia zapauzovaná)</translation>
</message>
@@ -1261,12 +1271,12 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1280,7 +1290,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1353,8 +1363,8 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Stav</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1514,117 +1524,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Priečinok %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Nie sú nastavené žiadne synchronizačné priečinky.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Žiaden.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Nedávne zmeny</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Otvoriť %1 priečinok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Spravované priečinky:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Otvoriť priečinok '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Otvoriť %1 v prehliadači</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Počítanie kvóty...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Neznámy stav</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Nastavenia...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Detaily...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Ukončiť %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Kvóta n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 sa používa</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Žiadne nedávno synchronizované položky</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synchronizovanie %1 z %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Až do dnešného dňa</translation>
</message>
@@ -1913,12 +1923,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared.</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 41fccfe..cabf5b1 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>Nedoločena napaka CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Datoteka %1</translation>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>V čakanju na začetek usklajevanja.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Strežnik trenutno ni na voljo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,8 +1356,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Stanje</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Mapa %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Brez</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Nedavne spremembe</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Odpri %1 mapo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Upravljane mape:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Odpri mapo '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Preračunavanje količinske omejitve ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Neznano stanje</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Nastavitve ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Podrobnosti ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Pomoč</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Končaj %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Količinska omejitev ni na voljo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Ni nedavno usklajenih predmetov</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Poteka usklajevanje %1 od %2 (%3 od %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 2af16d1..a8bae29 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync ospecificerat fel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation>Fil %1</translation>
</message>
@@ -468,39 +468,49 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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>
@@ -509,17 +519,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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -537,52 +547,52 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation>Servern är för tillfället inte tillgänglig.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
@@ -1260,12 +1270,12 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1279,7 +1289,7 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1352,8 +1362,8 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Status</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1513,117 +1523,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>Mapp %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Ingen synkroniseringsmapp är konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation>Ingen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation>Senaste ändringar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Öppna %1 mappen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Hanterade mappar:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation>Öppna mapp '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation>Beräknar kvot...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation>Okänd status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation>Inställningar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation>Detaljer...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Hjälp</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation>Avsluta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation>Kvot n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation>%1% av %2 används</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation>Inga filer har synkroniseras nyligen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synkar %1 av %2 (%3 av %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
@@ -1912,12 +1922,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna katalog får inte byta namn. Den kommer att döpas om till sitt original namn.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denna katalog får ej döpas om. Snälla döp den till Delad</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index f8903ac..f1cf10f 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,7 +1356,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
+ <source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>เปิดโฟลเดอร์ %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>ช่วยเหลือ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 6126aa6..1aa7f77 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>Невизначена помилка CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>Помилка</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,8 +1356,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>Статус</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>Жодна тека не налаштована для синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>Відкрити %1 каталог</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>Керовані теки:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>Допомога</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 30b6086..3256e14 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync 未定义错误。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,8 +1356,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>状态</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>文件夹 %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>没有已配置的同步文件夹。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>打开 %1 目录</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>管理的文件夹：</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>更新</translation>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index c4b4ec5..90dca26 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="263"/>
+ <location filename="../src/mirall/application.cpp" line="264"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -351,12 +351,12 @@
<translation>CSync 未知的錯誤。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="228"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because it is on the blacklist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="428"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="437"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -448,7 +448,7 @@
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="331"/>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
@@ -468,55 +468,65 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="389"/>
+ <location filename="../src/mirall/folder.cpp" line="391"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
+ <source>moved</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
+ <source>%1 to %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="456"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="744"/>
+ <location filename="../src/mirall/folder.cpp" line="754"/>
<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="747"/>
+ <location filename="../src/mirall/folder.cpp" line="757"/>
<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="751"/>
+ <location filename="../src/mirall/folder.cpp" line="761"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="754"/>
+ <location filename="../src/mirall/folder.cpp" line="764"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -534,52 +544,52 @@ Are you sure you want to perform this operation?</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="605"/>
+ <location filename="../src/mirall/folderman.cpp" line="602"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="608"/>
+ <location filename="../src/mirall/folderman.cpp" line="605"/>
<source>Waits to start syncing.</source>
<translation>等待啟動同步</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="611"/>
+ <location filename="../src/mirall/folderman.cpp" line="608"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="614"/>
+ <location filename="../src/mirall/folderman.cpp" line="611"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="617"/>
+ <location filename="../src/mirall/folderman.cpp" line="614"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="620"/>
+ <location filename="../src/mirall/folderman.cpp" line="617"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="625"/>
+ <location filename="../src/mirall/folderman.cpp" line="622"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="628"/>
+ <location filename="../src/mirall/folderman.cpp" line="625"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="631"/>
+ <location filename="../src/mirall/folderman.cpp" line="628"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="637"/>
+ <location filename="../src/mirall/folderman.cpp" line="634"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1254,12 +1264,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="439"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="436"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="387"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="385"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1283,7 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
- <source>Detailed Sync Status</source>
+ <source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1346,8 +1356,8 @@ Checked items will also be deleted if they prevent a directory from being remove
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="57"/>
- <source>Status</source>
- <translation>狀態</translation>
+ <source>Activity</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/settingsdialog.cpp" line="64"/>
@@ -1507,117 +1517,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="174"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="206"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
<translation>資料夾 %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="212"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
<translation>尚未指定同步資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="237"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="241"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="258"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
<translation>開啟%1資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
<translation>管理的資料夾:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="271"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="353"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="354"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="359"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
<source>Help</source>
<translation>說明</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="364"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="366"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="376"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="383"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="404"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
<source>No items synced recently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="441"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="438"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="463"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>最新的</translation>
</message>
@@ -1906,12 +1916,12 @@ Please ensure that your network connection is working.</source>
<context>
<name>PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="876"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="873"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="878"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="875"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list