[Pkg-owncloud-commits] [owncloud-client] 243/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 51e961e694665c0f4dd6b1879a98e876d97159f0
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Thu Mar 27 01:26:35 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 136 ++++++++++++++++----------------
translations/mirall_cs.ts | 136 ++++++++++++++++----------------
translations/mirall_de.ts | 138 ++++++++++++++++----------------
translations/mirall_el.ts | 136 ++++++++++++++++----------------
translations/mirall_en.ts | 126 ++++++++++++++---------------
translations/mirall_es.ts | 138 ++++++++++++++++----------------
translations/mirall_es_AR.ts | 136 ++++++++++++++++----------------
translations/mirall_et.ts | 136 ++++++++++++++++----------------
translations/mirall_eu.ts | 136 ++++++++++++++++----------------
translations/mirall_fa.ts | 132 +++++++++++++++----------------
translations/mirall_fi.ts | 136 ++++++++++++++++----------------
translations/mirall_fr.ts | 136 ++++++++++++++++----------------
translations/mirall_gl.ts | 136 ++++++++++++++++----------------
translations/mirall_hu.ts | 136 ++++++++++++++++----------------
translations/mirall_it.ts | 136 ++++++++++++++++----------------
translations/mirall_ja.ts | 136 ++++++++++++++++----------------
translations/mirall_nl.ts | 138 ++++++++++++++++----------------
translations/mirall_pl.ts | 138 ++++++++++++++++----------------
translations/mirall_pt.ts | 184 ++++++++++++++++++++++---------------------
translations/mirall_pt_BR.ts | 136 ++++++++++++++++----------------
translations/mirall_ru.ts | 136 ++++++++++++++++----------------
translations/mirall_sk.ts | 136 ++++++++++++++++----------------
translations/mirall_sl.ts | 136 ++++++++++++++++----------------
translations/mirall_sv.ts | 136 ++++++++++++++++----------------
translations/mirall_th.ts | 128 +++++++++++++++---------------
translations/mirall_uk.ts | 130 +++++++++++++++---------------
translations/mirall_zh_CN.ts | 132 +++++++++++++++----------------
translations/mirall_zh_TW.ts | 132 +++++++++++++++----------------
translations/pofiles/tr.po | 136 ++++++++++++++++----------------
29 files changed, 1984 insertions(+), 1980 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 59dde2e..a2bcd91 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota</b> Algunes carpetes, incloent els fitxers muntats a través de xarxa o compartits, poden tenir límits diferents.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Confirma l'eliminació de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Voleu aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Això no eliminarà els fitxers del client.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Confirmeu la reinicialització de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>S'està sincronitzant</translation>
</message>
@@ -181,27 +181,27 @@
<translation>No hi ha cap compte configurat</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>S'està sincronitzant.<br/>Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connectat a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, fitxer %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connectat a <a href="%1">%2</a> com a <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>No s'ha pogut crear el context-csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>El fitxer local %1 no existeix.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 hauria de ser una carpeta, però no ho és.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -380,67 +380,67 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>No es pot restablir l'estat de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Espera per començar la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>El servidor no està disponible actualment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
@@ -596,12 +596,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -653,12 +653,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Escriviu contrasenya</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
</message>
@@ -1290,17 +1290,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1327,22 +1327,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1469,27 +1469,27 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Compte</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Activitat</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>General</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Xarxa</translation>
</message>
</context>
<context>
@@ -1868,7 +1868,7 @@ It is not advisable to use it.</source>
<translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index a1d9b25..fa6d89e 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pozastavit</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Poznámka:</b> Některé složky, včetně síťových či sdílených složek, mohou mít jiné limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Obnovit</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdit odstranění složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Opravdu chcete zastavit synchronizaci složky <i>%1</i>?</p><p><b>Poznámka:</b> Tato akce nesmaže soubory z místní složky.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdit restartování složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 ze %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 místa na disku použito.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Žádné spojení s %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Připojeno k <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 z %2, soubor %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Připojeno k <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Momentálně nejsou k dispozici žádné informace o využití úložiště</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Nepodařilo se vytvořit csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Místní složka %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 by měl být adresář, ale není.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo odebráno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo staženo.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 dalších souborů bylo aktualizováno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 byl přejmenován na %2 a %3 dalších souborů bylo přejmenováno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 byl přejmenován na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 byl přesunut do %2 a %3 dalších souborů bylo přesunuto.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -380,67 +380,67 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Nelze obnovit stav složky</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<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="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Server je nyní nedostupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
@@ -596,12 +596,12 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
@@ -653,12 +653,12 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Zadejte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation>
</message>
@@ -1292,17 +1292,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
</message>
@@ -1329,22 +1329,22 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Místní soubor byl změněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Rozšíření X-OC-MTime není k dispozici, je vyžadováno ownCloud 5</translation>
</message>
@@ -1473,27 +1473,27 @@ Zkuste provést novou synchronizaci.
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Účet</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Aktivita</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Hlavní</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Síť</translation>
</message>
</context>
<context>
@@ -1874,7 +1874,7 @@ Zkuste provést novou synchronizaci.
<translation>Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 788e091..447866c 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Anhalten</translation>
</message>
@@ -119,60 +119,60 @@
<translation><b>Hinweis:</b> Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner, können unterschiedliche Beschränkungen haben.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Fortsetzen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Löschen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Wollen Sie wirklich die Synchronisation des Ordners <i>%1</i> beenden?</p><p><b>Anmerkung:</b> Dies wird keine Dateien von ihrem Rechner löschen.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Zurücksetzen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Wollen Sie wirklich den Ordner <i>%1</i> zurücksetzen und die Datenbank auf dem Klient neu aufbauen?</p><p><b>Anmerkung:</b>
Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) von %2 Serverkapazität in Benutzung.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Keine Verbindung mit %1 zu <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
@@ -182,27 +182,27 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbunden mit <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbunden mit <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
@@ -261,100 +261,100 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Kann keinen CSync-Kontext erstellen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 und %2 andere Dateien wurden aktualisiert</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 wurde in %2 umbenannt und %3 andere Dateien wurden umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 wurde in %2 verschoben und %3 andere Dateien wurden verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -363,17 +363,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -381,67 +381,67 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Der Server ist momentan nicht erreichbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Setup-Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
@@ -597,12 +597,12 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
@@ -654,12 +654,12 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Passwort eingeben</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation>
</message>
@@ -1293,17 +1293,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation>
</message>
@@ -1330,22 +1330,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Keine X-OC-MTime Erweiterung vorhanden, owncloud 5 ist erforderlich</translation>
</message>
@@ -1473,27 +1473,27 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Nutzerkonto</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Aktivität</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Allgemein</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Netzwerk</translation>
</message>
</context>
<context>
@@ -1874,7 +1874,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
@@ -2277,7 +2277,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
- <translation type="unfinished"/>
+ <translation><p><small>Erstellt aus Git-Revision <a href="%1">%2</a> vom %3, %4 mit Qt %5.</small><p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 931e721..aeb8c4b 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Παύση</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Σημείωση:</b> Κάποιοι φάκελοι, συμπεριλαμβανομένων των δικτυακών δίσκων ή των κοινόχρηστων φακέλων, μπορεί να έχουν διαφορετικά όρια. </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Συνέχεια</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Επιβεβαίωση αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Θέλετε στ' αλήθεια να σταματήσετε το συγχρονισμό του φακέλου <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό δεν θα αφαιρέσει τα αρχεία από το δέκτη.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του πελάτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 από %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Δεν υπάρχει σύνδεση με το %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Ο Συγχρονισμός Εκτελείται</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Αδυναμία δημιουργίας πλαισίου csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 επρεπε να ειναι χωρος αποθηκευσης αλλα δεν ειναι.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation> %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -380,67 +380,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμια εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη κατάσταση.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Ο Συγχρονισμός Παύθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμούς)</translation>
</message>
@@ -596,12 +596,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -653,12 +653,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation>
</message>
@@ -1292,17 +1292,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε το ξανά Κοινόχρηστος.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1329,22 +1329,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1472,27 +1472,27 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Λογαριασμός</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Δραστηριότητα</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Γενικά</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Δίκτυο</translation>
</message>
</context>
<context>
@@ -1872,7 +1872,7 @@ It is not advisable to use it.</source>
<translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 4a79e38..6a38c6d 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -91,7 +91,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation type="unfinished"></translation>
</message>
@@ -121,59 +121,59 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
@@ -183,27 +183,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
@@ -262,116 +262,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -379,67 +379,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -595,12 +595,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
@@ -652,12 +652,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"></translation>
</message>
@@ -1287,17 +1287,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1324,22 +1324,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"></translation>
</message>
@@ -1865,7 +1865,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index be51103..f04a468 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algunas carpetas, incluyendo unidades de red o carpetas compartidas, pueden tener límites diferentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar la eliminación de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Realmente desea dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Note:</b> Esto no eliminará los archivos de su cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Confirme que desea restablecer la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 espacio usado en el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>No hay conexión a %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
@@ -181,27 +181,27 @@
<translation>No se ha configurado la cuenta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido eliminados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido descargados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 y %2 otros archivos han sido actualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 ha sido renombrado a %2 y %3 otros archivos han sido renombrados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 ha sido movido a %2 y %3 otros archivos han sido movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -380,67 +380,67 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>No se ha podido restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un antiguo registro (journal) de sincronización '%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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Esperando el inicio de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<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="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -596,12 +596,12 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
@@ -653,12 +653,12 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Introduzca la Contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, introduzca su %1 contraseña para el usuario '%2':</translation>
</message>
@@ -1292,17 +1292,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado.</translation>
</message>
@@ -1329,22 +1329,22 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>No hay una extensión X-OC-MTime, se requiere ownCloud 5</translation>
</message>
@@ -1472,27 +1472,27 @@ Intente sincronizar los archivos nuevamente.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Cuenta</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Actividad</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>General</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Red</translation>
</message>
</context>
<context>
@@ -1873,7 +1873,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
@@ -2276,7 +2276,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
- <translation type="unfinished"/>
+ <translation><p><small>Construido de la revisión de Git <a href="%1">%2</a> en %3, %4 usando Qt %5.</small><p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 018bf6c..0a565ab 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algunas carpetas, incluidas las montadas en red o las carpetas compartidas, pueden tener diferentes límites.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Confirmá la eliminación del directorio</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>¿Realmente deseas detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b>Estp no removerá los archivos desde tu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Confirme el reseteo de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p>< [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
@@ -181,27 +181,27 @@
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>El directorio local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -380,67 +380,67 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>No se pudo </translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Esperando el comienzo de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>El servidor actualmente no está disponible.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -596,12 +596,12 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -653,12 +653,12 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Ingresar contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation>
</message>
@@ -1290,17 +1290,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1327,22 +1327,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1470,27 +1470,27 @@ Intente sincronizar estos nuevamente.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Cuenta</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Actividad</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>General</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Red</translation>
</message>
</context>
<context>
@@ -1869,7 +1869,7 @@ Intente sincronizar estos nuevamente.</translation>
<translation>El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 24e8ce3..486d708 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Märkus:</b> Mõned kataloogid, sealhulgas võrgust ühendatud või jagatud kataloogid, võivad omada erinevaid limiite.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Taasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Kinnita kausta eemaldamist</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Kas tõesti soovid peatada kataloogi <i>%1</i> sünkroniseerimist?.</p><p><b>Märkus:</b> See ei eemalda faile sinu kliendist.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Kinnita kataloogi algseadistus</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ühendatud <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 / %2, fail %3 / %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Ühendatud <a href="%1">%2</a> kui <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Ei suuda luua csync-konteksti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 peaks olema kataloog, kuid pole seda mitte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -380,67 +380,67 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Ei suutnud tühistada kataloogi staatust</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Ootab sünkroniseerimise alustamist.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Server pole hetkel saadaval.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
@@ -596,12 +596,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
@@ -653,12 +653,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Sisesta parool</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Palun sisesta %1 parool kasutajale '%2':</translation>
</message>
@@ -1292,17 +1292,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1329,22 +1329,22 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1472,27 +1472,27 @@ Proovi neid uuesti sünkroniseerida.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Konto</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Toimingud</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Üldine</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Võrk</translation>
</message>
</context>
<context>
@@ -1873,7 +1873,7 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 570ba8b..c03c2af 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pausarazi</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Oharra:</b>Karpeta batzuk, sarekoa edo partekatutakoak, muga ezberdinak izan ditzazkete.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Berrekin</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Baieztatu karpetaren ezabatzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Baieztatu Karpetaren Leheneratzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a>ra konektatuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Bertako %1 karpeta ez da existitzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 karpeta bat izan behar zen baina ez da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Ezin izan da karpetaren egoera berrezarri</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Zerbitzaria orain ez dago eskuragarri.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Erabiltzaileak Bertan Behera Utzi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Sartu Pasahitza</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation>
</message>
@@ -1287,17 +1287,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1324,22 +1324,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1467,27 +1467,27 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Kontua</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Jarduera</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Orokorra</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Sarea</translation>
</message>
</context>
<context>
@@ -1866,7 +1866,7 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 9321562..c90c773 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>توقف کردن</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>قبول کردن پاک شدن پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 باید یک پوشه باشد اما نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>صبر کنید تا همگام سازی آغاز شود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1285,17 +1285,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1469,17 +1469,17 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>حساب کاربری</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>قعالیت</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>عمومی</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
@@ -1863,7 +1863,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 0148874..feb1233 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Keskeytä</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Jatka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Vahvista kansion poisto</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 palvelimen tilasta käytössä.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Muodosta yhteys - <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1/%2, tiedosto %3/%4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Paikallista kansiota %1 ei ole olemassa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Odottaa synkronoinnin alkamista.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Palvelin ei ole käytettävissä.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Anna salasana</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Anna käyttäjän '%2' %1-salasana:</translation>
</message>
@@ -1286,17 +1286,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1323,22 +1323,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1465,27 +1465,27 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Tili</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Toimet</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Yleiset</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Verkko</translation>
</message>
</context>
<context>
@@ -1865,7 +1865,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index d6b7c32..ca4fcda 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Mettre en pause</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Note :</b> Certains fichiers, incluant des dossiers montés depuis le réseau ou des dossiers partagés, peuvent avoir des limites différentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Reprendre</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Confirmer le retrait du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Voulez-vous réellement arrêter la synchronisation du dossier <i>%1</i> ?</p><p><b>Note : </b> Cela ne supprimera pas les fichiers sur votre client.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Confirmation de la réinitialisation du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 d'espace utilisé sur le serveur.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Aucune connexion à %1 à <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La synchronisation est en cours.<br/>Voulez-vous y mettre un terme?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connecté à <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, fichier %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connecté à <a href="%1">%2</a> en tant que <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Impossible de créer le contexte csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Le dossier local %1 n'existe pas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 doit être un répertoire, mais ce n'en ai pas un.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été supprimés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été téléchargés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 et %2 autres fichiers ont été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 a été renommé en %2 et %3 autres fichiers ont été renommés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 a été déplacé vers %2 et %3 autres fichiers ont été déplacés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -380,67 +380,67 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Impossible de réinitialiser l'état du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Le serveur est indisponible actuellement.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<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="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
@@ -596,12 +596,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
@@ -653,12 +653,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Entrez le mot de passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
</message>
@@ -1292,17 +1292,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation>
</message>
@@ -1329,22 +1329,22 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Aucune extension X-OC-MTime, ownCloud 5 est exigé</translation>
</message>
@@ -1472,27 +1472,27 @@ Il est déconseillé de l'utiliser.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Compte</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Activité</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Général</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Réseau</translation>
</message>
</context>
<context>
@@ -1873,7 +1873,7 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 653ace7..103cbca 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algúns cartafoles, como os cartafoles de rede montados ou os compartidos, poden ten diferentes límites.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar a eliminación do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Confirma que quere deter a sincronización do cartafol <i>%1</i>?</p><p><b>Nota:</b> Isto non retirará os ficheiros no seu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar o restabelecemento do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation> Espazo usado do servidor %1 (%3%) de %2.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Sen conexión con %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Estase realizando a sincronización.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Non é posíbel crear o contexto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>O cartafol local %1 non existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio e non o é.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron retirados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron descargados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>O ficheiro %1 e outros %2 foron enviados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado satisfactoriamente a %2 e outros %3 tamén foron renomeados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido satisfactoriamente a %2 e outros %3 tamén foron movidos satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -380,67 +380,67 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Non foi posíbel restabelecer o estado do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Agardando polo comezo da sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<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="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
@@ -596,12 +596,12 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
@@ -653,12 +653,12 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Escriba o contrasinal</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriba o contrasinal %1 para o usuario «%2»:</translation>
</message>
@@ -1292,17 +1292,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation>
</message>
@@ -1329,22 +1329,22 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presentes)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Non existe a extensión X-OC-MTime, require ownCloud 5</translation>
</message>
@@ -1472,27 +1472,27 @@ Tente sincronizalos de novo.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Conta</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Actividade</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Xeral</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Rede</translation>
</message>
</context>
<context>
@@ -1873,7 +1873,7 @@ Tente sincronizalos de novo.</translation>
<translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 3050e35..b628d60 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Szünet</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Folytatás</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Könyvtár törlésének megerősítése</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Szinkronizálás fut</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nincs beállított kapcsolat.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 helyi mappa nem létezik.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 könyvtár kell legyen, de nem az.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<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="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<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="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Jelszómegadás</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1285,17 +1285,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1464,27 +1464,27 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Fiók</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Aktivitás</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Általános</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Hálózat</translation>
</message>
</context>
<context>
@@ -1863,7 +1863,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index a211c2b..085a6eb 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> alcune cartelle, incluse le cartelle montate o condivise in rete, potrebbero avere limiti diversi.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Riprendi</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Conferma la rimozione della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ciò non rimuoverà i file dal tuo client.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Conferma il ripristino della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 di %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) di %2 spazio in uso sul server.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nessuna connessione a %1 su <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connesso a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 di %2, file %3 di %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connesso a <a href="%1">%2</a> come <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Impossibile creare il contesto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>La cartella locale %1 non esiste.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 dovrebbe essere una cartella.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati rimossi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati scaricati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 altri file sono stati aggiornati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 è stato rinominato in %2 e %3 altri file sono stati rinominati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 è stato spostato in %2 e %3 altri file sono stati spostati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -380,67 +380,67 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>È stato trovato un vecchio registro 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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Attende l'inizio della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Il server è attualmente non disponibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stato completata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
@@ -596,12 +596,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
@@ -653,12 +653,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Digita la password</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Digita la password di %1 per l'utente '%2':</translation>
</message>
@@ -1291,17 +1291,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation>
</message>
@@ -1328,22 +1328,22 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Nessun e-tag era presente)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Non è presente l'estensione X-OC-MTime, è richiesto ownCloud 5</translation>
</message>
@@ -1471,27 +1471,27 @@ Prova a sincronizzare nuovamente.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Account</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Attività</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Generale</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Rete</translation>
</message>
</context>
<context>
@@ -1872,7 +1872,7 @@ Prova a sincronizzare nuovamente.</translation>
<translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 152631e..c8eddf6 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>一時停止</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>注:</b> 外部ネットワークストレージ、共有フォルダーを含んだフォルダーの場合は、上限値が異なることがあります。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>フォルダーの削除を確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>フォルダー<i>%1</i>の同期を本当に止めますか？</p><p><b>注:</b> これによりクライアントからファイルが削除されることはありません。</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>フォルダーのリセットを確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 使用中のサーバー領域</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation><a href="%2">%3</a> に %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
@@ -181,27 +181,27 @@
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> へ接続しました。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, ファイル数 %3 of %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a> に <i>%3</i> として接続</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>csync-context を作成できません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 はディレクトリのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルが削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルがダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 の名前が %2 に変更され、他 %3 個のファイルの名前が変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 が %2 に移され、他 %3 個のファイルが移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -380,67 +380,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>フォルダーの状態をリセットできませんでした</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>サーバーは現在利用できません。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
@@ -597,12 +597,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
@@ -654,12 +654,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>パスワードを入力してください</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>ユーザー '%2' の %1 パスワードを入力してください:</translation>
</message>
@@ -1291,17 +1291,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
</message>
@@ -1328,22 +1328,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しませんでした。（e-tag が存在しませんでした）</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>X-OC-MTime 拡張がありません、 ownCloud 5 が必要です。</translation>
</message>
@@ -1471,27 +1471,27 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>アカウント</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>アクティビティ</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>一般</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>ネットワーク</translation>
</message>
</context>
<context>
@@ -1872,7 +1872,7 @@ It is not advisable to use it.</source>
<translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index f6a4763..3b8f797 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Opmerking:</b> Sommige mappen, waaronder netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Hervatten</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Bevestig het verwijderen van de map</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Weet u zeker dat u de synchronisatie van de map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Bevestig map reset</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Wilt u de map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 van %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) van %2 serverruimte in gebruik.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Geen verbinding naar %1 op <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbonden met <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 van %2, bestand %3 van %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbonden met <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Onmogelijk om een csync-context te maken</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 zou een map moeten zijn, maar is dit niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 en %2 andere bestanden zijn bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 is hernoemd naar %2 en %3 andere bestanden zijn ook hernoemd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 is verplaatst naar %2 en %3 andere bestanden zijn ook verplaatst.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -380,67 +380,67 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Kan de beginstaat van de map niet terugzetten</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>De server is nu niet beschikbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was succesvol.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
@@ -596,12 +596,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
@@ -653,12 +653,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Vul het wachtwoord in</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
</message>
@@ -1292,17 +1292,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation>
</message>
@@ -1329,22 +1329,22 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Er is geen X-OC-MTime extensie aanwezig, ownCloud 5 is vereist</translation>
</message>
@@ -1472,27 +1472,27 @@ Probeer opnieuw te synchroniseren.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Account</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Activiteit</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Algemeen</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Netwerk</translation>
</message>
</context>
<context>
@@ -1873,7 +1873,7 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
@@ -2276,7 +2276,7 @@ Probeer opnieuw te synchroniseren.</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
- <translation type="unfinished"/>
+ <translation><p><small>Gebouwd vanuit Git revisie <a href="%1">%2</a> op %3, %4 gebruik makend van Qt %5.</small><p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index a0c501b..7649858 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Wstrzymaj</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Uwaga:</b> Niektóre foldery, włączając podłączone w sieci lub współdzielone mogą mieć różne limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Wznów</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Potwierdź usunięcie katalogu</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Czy naprawdę chcesz przerwać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> Ta czynność nie usunie plików z klienta.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Potwierdź reset folderu </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 przestrzeni na serwerze w użyciu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Brak połączenia do %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Podłączony do <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 z %2, plik %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Podłączony do <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Nie można utworzyć kontekstu csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 inne pliki zostały usunięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 pozostałe pliki zostały ściągnięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 inne pliki zostały zaktualizowane.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 zmienił nazwę na %2 i %3 inne pliki mają zmienione nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 został zmieniony na %2 i %3 inne pliku zostały przeniesione.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
Jeśli Ty lub Twój administrator zresetowali Twoje konto na serwerze, wybierz "Zachowaj pliki". Jeśli chcesz aby Twoje dane zostały usunięte, wybierz "Usuń wszystkie pliki".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -380,67 +380,67 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Nie udało się zresetować stanu folderu</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Czekają na uruchomienie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Serwer jest obecnie niedostępny.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
@@ -596,12 +596,12 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
@@ -653,12 +653,12 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Wprowadź hasło</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Proszę podać %1 hasło dla użytkownika '%2':</translation>
</message>
@@ -1292,17 +1292,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik</translation>
</message>
@@ -1329,22 +1329,22 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Brak rozszerzenia X-OC-MTime, wymagany ownCloud 5</translation>
</message>
@@ -1472,27 +1472,27 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Konto</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Aktywność</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Ogólne</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Sieć</translation>
</message>
</context>
<context>
@@ -1873,7 +1873,7 @@ Niezalecane jest jego użycie.</translation>
<translation>Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
@@ -2277,7 +2277,7 @@ Kliknij</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small><p></source>
- <translation type="unfinished"/>
+ <translation><p><small>Zbudowane z rewizji Git <a href="%1">%2</a> na %3, %4 z użyciem Qt %5.</small><p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 1eedd00..5291068 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algumas pastas, incluindo pastas partilhadas ou montadas na rede, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Confirme a remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Quer mesmo parar a sincronização da pasta <i>%1</i>?</p><b>Nota:</b> Isto não irá remover os ficheiros no seu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar reposição da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Deseja mesmo repor a pasta <i>%1</i> e reconstruir a base de dados do seu cliente?</p><p><b>Nota:</b> Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
- <translation type="unfinished"/>
+ <translation>%1 (%3%) de %2 de espaço utilizado.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>A sincronização está a decorrer</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Histórico de utilização de armazenamento não disponível.</translation>
</message>
@@ -221,7 +221,7 @@
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
<source>&User:</source>
- <translation type="unfinished"/>
+ <translation>&Utilizador</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
@@ -260,116 +260,118 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Impossível criar 'csync-context'</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 devia de ser um directório mas não é</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
- <translation type="unfinished"/>
+ <translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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>Esta sincronização irá remover todos os ficheiros sincronizados na pasta local '%1'.
+Se você ,ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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>Esta sincronização irá remover todos os ficheiros sincronizados na pasta local '%1'.
+Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -377,67 +379,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Não foi possível repor o estado da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>A aguardar o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>A sincronização está a correr.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>O servidor não está disponível de momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<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="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Cancelado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>A sincronização está em pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronização em pausa)</translation>
</message>
@@ -593,12 +595,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +652,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Introduza a Palavra-passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor introduza %1 password para o utilizador '%2':</translation>
</message>
@@ -682,7 +684,9 @@ Are you sure you want to perform this operation?</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 type="unfinished"/>
+ <translation>Os ficheiros ou diretórios que correspondam a uma regra não serão sincronizados.
+
+Itens verificados também serão removidos se evitarem que um diretório seja removido. Isto é útil para os metadados.</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="97"/>
@@ -961,7 +965,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="91"/>
<source>No updates available. Your installation is at the latest version.</source>
- <translation type="unfinished"/>
+ <translation>Sem novas atualizações. Já tem a última versão instalada.</translation>
</message>
</context>
<context>
@@ -1285,17 +1289,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. A alterar para nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1306,7 +1310,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
<location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
+ <translation>Ficheiro local foi alterado durante a sincronização. A sincronizar quando chegar na totalidade</translation>
</message>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
@@ -1322,22 +1326,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
- <translation type="unfinished"/>
+ <translation>Ficheiro local alterado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1465,27 +1469,27 @@ Por favor tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Conta</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Actividade</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Geral</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Rede</translation>
</message>
</context>
<context>
@@ -1546,17 +1550,17 @@ Por favor tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
- <translation type="unfinished"/>
+ <translation><h3>Emissor</h3></translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
- <translation type="unfinished"/>
+ <translation>Emissor:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
- <translation type="unfinished"/>
+ <translation>Emitido em:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="113"/>
@@ -1566,7 +1570,7 @@ Por favor tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
- <translation type="unfinished"/>
+ <translation><h3>Impressões digitais</h3></translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="119"/>
@@ -1586,7 +1590,7 @@ Por favor tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
- <translation type="unfinished"/>
+ <translation>%1 (auto-assinado)</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="146"/>
@@ -1781,7 +1785,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/syncengine.cpp" line="143"/>
<source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
+ <translation>CSync: erro ao autenticar-se no servidor proxy.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="146"/>
@@ -1816,7 +1820,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/syncengine.cpp" line="164"/>
<source>CSync failed to access </source>
- <translation type="unfinished"/>
+ <translation>CSync: falha no acesso</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="167"/>
@@ -1837,7 +1841,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/syncengine.cpp" line="179"/>
<source>Aborted by the user</source>
- <translation type="unfinished"/>
+ <translation>Cancelado pelo utilizador</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="183"/>
@@ -1857,17 +1861,17 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro está na lista de ficheiros a ignorar.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="281"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
+ <translation>Impossível inicializar sincronização 'journal'.</translation>
</message>
</context>
<context>
@@ -1999,7 +2003,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="387"/>
<source>No items synced recently</source>
- <translation type="unfinished"/>
+ <translation>Sem itens sincronizados recentemente</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="403"/>
@@ -2064,7 +2068,7 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
- <translation type="unfinished"/>
+ <translation><small>apaga o conteúdo da pasta local antes de sincronizar de acordo com a nova configuração.</small></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index f3aeb24..3a31570 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Confirma remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Você realmente deseja parar de sincronizar a pasta <i>%1</i>?</p><p><b>Nota:</b> Isso não vai remover os arquivos de seu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Confirme Reiniciar Pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar o tráfego de dados significativo e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 do espaço em uso no servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nenhuma conexão para %1 em <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Sem %1 conexão configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Sincronização acontecendo</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado à <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, file %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente, não há informações de uso de armazenamento disponível.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Não é possível criar csync-contexto</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 deveria ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram removidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram baixados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros arquivos foram atualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros três arquivos foram renomeados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros arquivos foram movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -380,67 +380,67 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Não foi possível redefinir o estado da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Aguardando o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Servidor indisponível no momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<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="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Erro de configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Usuário Abortou</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
@@ -596,12 +596,12 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
@@ -654,12 +654,12 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Entrar Senha</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor entrar %1 senha para o usuário '%2':</translation>
</message>
@@ -1290,17 +1290,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado.</translation>
</message>
@@ -1327,22 +1327,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último pedaço. (Nenhuma e-etiqueta estava presente)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Sem extensão X-OC-mtime, ownCloud 5 é necessário</translation>
</message>
@@ -1470,27 +1470,27 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Conta</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Atividade</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Geral</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Rede</translation>
</message>
</context>
<context>
@@ -1871,7 +1871,7 @@ Tente sincronizar novamente.</translation>
<translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 3514672..d0a6242 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Заметьте:</b> Некоторые папки, включая сетевые или общие, могут иметь разные ограничения.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Продолжить</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Подтвердите удаление папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Вы действительно хотите прекратить синхронизацию папки <i>%1</i>?</p><p><b>Примечание:</b> Это действие не удалит файлы с клиента.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Подтвердить сброс папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Соединились с <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Подключён к <a href="%1">%2</a> как <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Невозможно создать контекст csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 должен быть каталогом, но не является таковым.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -380,67 +380,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Невозможно сбросить состояние папки</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Ожидает, чтобы начать синхронизацию.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Сервер недоступен.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
@@ -596,12 +596,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
@@ -653,12 +653,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Введите пароль</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Пожалуйста введите пароль от %1 для пользователя '%2':</translation>
</message>
@@ -1292,17 +1292,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1329,22 +1329,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1472,27 +1472,27 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Учётная запись</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Действие</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Основные</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Сеть</translation>
</message>
</context>
<context>
@@ -1873,7 +1873,7 @@ It is not advisable to use it.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index b31b3d8..2f49e33 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Pauza</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Poznámka:<b> Niektoré priečinky, zahŕňajúc sieťové alebo zdieľané, môžu mať odlišné limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Obnovenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdiť odstránenie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Určite chcete zastaviť synchronizáciu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto neodstráni súbory z vášho klienta.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdiť resetovanie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nenastavený žiaden účet.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Pripojené k <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 z %2, súbor %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Pripojené k <a href="%1">%2</a> ako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Nemožno vytvoriť "csync-kontext"</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokálny priečinok %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 by mal byť priečinok, avšak nie je.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -380,67 +380,67 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Nemožno resetovať stav priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Čakanie na štart synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<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="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Zrušenie používateľom</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia zapauzovaná)</translation>
</message>
@@ -596,12 +596,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -653,12 +653,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Vložte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation>
</message>
@@ -1291,17 +1291,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1328,22 +1328,22 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1470,27 +1470,27 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Účet</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Aktivita</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Všeobecné</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Sieť</translation>
</message>
</context>
<context>
@@ -1869,7 +1869,7 @@ Nie je vhodné ju používať.</translation>
<translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť synchronizované medzi platformami.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 2fdcafc..46ecb84 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Premor</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Opomba:</b> nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Nadaljuj</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Potrdi odstranitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem mape iz odjemalca ne bodo odstranjene.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Potrdi ponastavitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ni povezave z %1 pri <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljenih %1 povezav.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 od %2, datoteka %3 od %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Ni mogoče ustvariti vsebine csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bi morala biti mapa, vendar ni.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Z usklajevanjem bodo odstranjene vse krajevne datoteke v mapi '%1'.
Če je bil račun na strežniku kakorkoli ponastavljen, izberite možnost "Ohrani datoteke", če pa želite datoteke res odstraniti, izberite drugo možnost.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -380,67 +380,67 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Ni mogoče ponastaviti stanja mape</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>V čakanju na začetek usklajevanja.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Strežnik trenutno ni na voljo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<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="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
@@ -596,12 +596,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
@@ -653,12 +653,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Vnos gesla</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation>
</message>
@@ -1292,17 +1292,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1329,22 +1329,22 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Ni prejetega odziva s strežnnika s potrdilom o prejemu zadnjega dela datoteke (ni prejete oznake).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Ni razširitve X-OC-MTime, saj zahteva namestitev ownCloud 5.</translation>
</message>
@@ -1472,27 +1472,27 @@ Te je treba uskladiti znova.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Račun</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Dejavnosti</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Splošno</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Omrežje</translation>
</message>
</context>
<context>
@@ -1873,7 +1873,7 @@ Te je treba uskladiti znova.</translation>
<translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 75ea164..d3c71f4 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Notera:</b> Vissa mappar, inklusive nätverksmonterade eller delade mappar, kan ha olika begränsningar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Återuppta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Bekräfta radering av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Vill du verkligen stoppa synkroniseringen av mappen <i>%1</i>?</p><p><b>Notera:</b> Detta kommer inte att radera filerna från din klient.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Bekräfta återställning av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ansluten till <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 av %2, fil %3 av %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>Kan inte skapa csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Den lokala mappen %1 finns inte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ska vara en mapp, men är inte det.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -380,67 +380,67 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Kunde inte återställa mappens skick</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<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="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<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="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<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="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
@@ -596,12 +596,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -653,12 +653,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1290,17 +1290,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<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>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1327,22 +1327,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1469,27 +1469,27 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Konto</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Aktivitet</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Allmänt</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Nätverk</translation>
</message>
</context>
<context>
@@ -1868,7 +1868,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 1e6c472..0ac9e98 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>หยุดชั่วคราว</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>ดำเนินการต่อ</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>ยืนยันการลบโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1285,17 +1285,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1479,7 +1479,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>ทั่วไป</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
@@ -1863,7 +1863,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 646295a..e946f49 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Відновлення</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Підтвердіть видалення каталогу</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 повинна бути текою, але нею не є.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1285,17 +1285,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1474,12 +1474,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Активність</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Загалом</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
@@ -1863,7 +1863,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 609f167..3389865 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>暂停</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>继续</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>确认移除文件夹</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>同步正在运行</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>正在执行同步。<br />您确定要关闭它吗？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, file %3 of %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>不能生成 csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 应为目录但并不是。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>不能重置文件夹状态</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>服务器当前是不可用的。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1285,17 +1285,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1469,17 +1469,17 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>账户</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>动态</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>常规</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
@@ -1863,7 +1863,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 0c7e745..a7e7e0f 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>暫停</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>注意:</b> 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>繼續</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>確認移除資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>您確定要停止同步資料夾<i>%1</i>?</p><p><b>注意:</b> 這不會從您的裝置移除檔案。</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>資料夾重設確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>無%1連線設定</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>同步中</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>正在同步中<br/>你真的想要中斷？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<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="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<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="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>無法重置資料夾狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>等待啟動同步</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1285,17 +1285,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<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/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1469,17 +1469,17 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>帳號</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>活動</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>一般</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
@@ -1863,7 +1863,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 92d4f14..aabd363 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="141"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="160"/>
<source>Pause</source>
<translation>Beklet</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Not:</b> Ağa bağlanmış veya paylaşılan klasörler gibi klasörler, farklı sınırlara sahip olabilirler.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="143"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="162"/>
<source>Resume</source>
<translation>Devam et</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="313"/>
<source>Confirm Folder Remove</source>
<translation>Klasör Kaldırma İşlemini Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="295"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="314"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Gerçekten <i>%1</i> klasörünü eşitlemeyi durdurmak istiyor musunuz?</p><p><b>Not:</b> Bu işlem dosyaları istemcinizden kaldırmayacaktır.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="350"/>
<source>Confirm Folder Reset</source>
<translation>Klasör Sıfırlamayı Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="332"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="351"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacaktır, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="693"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>Sunucu alanının %1 / %2 (%%3) kısmı kullanımda.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="732"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>%1 bağlantısı <a href="%2">%3</a> üzerinde yok.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="739"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="758"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="442"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="461"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="443"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="462"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="725"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="744"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> ile bağlı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1/%2, %3/%4 dosya</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="728"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="747"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation><a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="697"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="100"/>
<source>Unable to create csync-context</source>
<translation>csync-context oluşturma başarısız</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="158"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 yerel klasörü mevcut değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="161"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bir dizin olmalıdır ancak değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="164"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="324"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="410"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="404"/>
+ <location filename="../src/mirall/folder.cpp" line="417"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="411"/>
+ <location filename="../src/mirall/folder.cpp" line="424"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ve diğer %2 dosya güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="418"/>
+ <location filename="../src/mirall/folder.cpp" line="431"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1, %2 olarak ve diğer %3 dosya adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="433"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="438"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1, %2 konumuna ve diğer %3 dosya taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="440"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="435"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="692"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Bu eşitleme, yerel eşitleme klasörü '%1' içindeki tüm dosyaları kaldıracak.
Eğer siz veya yöneticiniz sunucudaki hesabınızı sıfırlamışsa, "Dosyaları koru" seçin. Eğer verinizin kaldırılmasını istiyorsanız, "Tüm dosyaları kaldır" seçin.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="695"/>
+ <location filename="../src/mirall/folder.cpp" line="710"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="714"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="702"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -380,67 +380,67 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="167"/>
+ <location filename="../src/mirall/folderman.cpp" line="170"/>
<source>Could not reset folder state</source>
<translation>Klasör durumu sıfırılanamadı</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="168"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Waits to start syncing.</source>
<translation>Eşitleme başlatmak için bekleniyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Server is currently not available.</source>
<translation>Sunucu şu an kullanılabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Son eşitleme başarılıydı, ancak bireysel dosyalarda uyarılar vardı</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>Setup Error.</source>
<translation>Kurulum hatası.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
@@ -596,12 +596,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket altık. Sonraki işlemde yeniden denenecek.</translation>
</message>
@@ -653,12 +653,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="273"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Parolayı Girin</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation>
</message>
@@ -1291,17 +1291,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="221"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Lütfen Paylaşılan olarak geri adlandırın.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="238"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi.</translation>
</message>
@@ -1328,22 +1328,22 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>X-OC-MTime uzantısı yok, ownCloud 5 gerekli</translation>
</message>
@@ -1471,27 +1471,27 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
<source>%1</source>
- <translation type="unfinished"/>
+ <translation>%1</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
<source>Account</source>
- <translation type="unfinished"/>
+ <translation>Hesap</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
<source>Activity</source>
- <translation type="unfinished"/>
+ <translation>Etkinlik</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
<source>General</source>
- <translation type="unfinished"/>
+ <translation>Genel</translation>
</message>
<message>
<location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation>Ağ</translation>
</message>
</context>
<context>
@@ -1872,7 +1872,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="436"/>
+ <location filename="../src/mirall/syncengine.cpp" line="442"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list