[Pkg-owncloud-commits] [owncloud-client] 65/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:34 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 e32ca49c313e3fbf705b4a0529eb5b425b98c747
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Wed Feb 19 09:42:10 2014 -0500
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 247 +++++++++++++++++++++++-------------------
translations/mirall_cs.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_de.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_el.ts | 247 +++++++++++++++++++++++-------------------
translations/mirall_en.ts | 237 +++++++++++++++++++++-------------------
translations/mirall_es.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_es_AR.ts | 243 ++++++++++++++++++++++-------------------
translations/mirall_et.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_eu.ts | 241 ++++++++++++++++++++++-------------------
translations/mirall_fa.ts | 237 +++++++++++++++++++++-------------------
translations/mirall_fi.ts | 241 ++++++++++++++++++++++-------------------
translations/mirall_fr.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_gl.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_hu.ts | 237 +++++++++++++++++++++-------------------
translations/mirall_it.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_ja.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_nl.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_pl.ts | 245 ++++++++++++++++++++++-------------------
translations/mirall_pt.ts | 237 +++++++++++++++++++++-------------------
translations/mirall_pt_BR.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_ru.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_sk.ts | 247 +++++++++++++++++++++++-------------------
translations/mirall_sl.ts | 251 +++++++++++++++++++++++--------------------
translations/mirall_sv.ts | 241 ++++++++++++++++++++++-------------------
translations/mirall_th.ts | 237 +++++++++++++++++++++-------------------
translations/mirall_uk.ts | 237 +++++++++++++++++++++-------------------
translations/mirall_zh_CN.ts | 241 ++++++++++++++++++++++-------------------
translations/mirall_zh_TW.ts | 237 +++++++++++++++++++++-------------------
translations/pofiles/tr.po | 251 +++++++++++++++++++++++--------------------
29 files changed, 3862 insertions(+), 3253 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 0678a24..2353efd 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>S'està sincronitzant.<br/>Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 de %2 (%3%) en ús.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connectat a <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Copletament</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 de %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Completament acabat.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Sense connexió amb %1 a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Èxit.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync ha fallat en crear un fitxer de bloqueig.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>No s'ha pogut carregar el connector %1 per csync.<br/>Comproveu la instal·lació!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>L'hora del sistema d'aquest client és diferent de l'hora del sistema del servidor. Useu un servei de sincronització de temps (NTP) en el servidor i al client perquè l'hora sigui la mateixa.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync no ha pogut detectar el tipus de fitxers del sistema.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync ha patit un error mentre processava els àrbres interns.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ha fallat en reservar memòria.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de paràmetre en CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>El pas d'actualització del processat de CSync ha fallat.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>El pas de reconciliació del processat de CSync ha fallat.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>El pas de propagació del processat de CSync ha fallat.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>La carpeta destí no existeix.</p><p>Comproveu la configuració de sincronització</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>No es pot escriure el fitxer remot. Reviseu l'acces remot.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>No es pot escriure al sistema de fitxers local. Reviseu els permisos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync ha fallat en connectar a través d'un proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync no s'ha pogut acreditar amb el proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync ha fallat en cercar el proxy o el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>L'autenticació de CSync ha fallat al servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync ha fallat en no implementar el permís denegat.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync ha intentat crear una carpeta que ja existeix.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: No hi ha espai disponible al servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Error inespecífic de CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>La sincronització d'enllaços simbòlics no està implementada.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>El fitxer està a la llista d'ignorats.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ha fallat en connectar-se a la xarxa.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>S'ha superat el temps d'espera de la connexió a la xarxa.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>S'ha produït un error en la transmissió HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync ha fallat en accedir</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Aturat per l'usuari</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>S'ha produït l'error intern número %1</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<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="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Fitxer %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Fitxer %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>baixat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>eliminat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>actualitzat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>reanomena</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>mogut</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' ha estat %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Fitxers %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' i %2 altres fitxers s'han %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -1392,40 +1392,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>L'usuari ha aturat la sincronització.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1433,36 +1420,62 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>No s'ha pogut esborrar la carpeta %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>El fitxer local ha canviat durant la sincronització, es sincronitzarà quan arribi complet</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>L'usuari ha aturat la sincronització.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1815,6 +1828,14 @@ Assegureu-vos que la connexió a la xarxa funciona.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2136,27 +2157,27 @@ Assegureu-vos que la connexió a la xarxa funciona.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2212,7 +2233,7 @@ Assegureu-vos que la connexió a la xarxa funciona.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Context</translation>
</message>
@@ -2238,7 +2259,7 @@ Assegureu-vos que la connexió a la xarxa funciona.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>esborrat</translation>
</message>
@@ -2249,46 +2270,46 @@ Assegureu-vos que la connexió a la xarxa funciona.</translation>
<translation>S'ha mogut a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>baixant</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>pujant</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inactiu</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>iniciant</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>acabat</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>elimina</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>mou</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>mogut</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 4f953c8..42f78b5 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 z %2 (%3%) v užívání.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Připojeno k <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Úplně</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 z %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Úplně dokončeno.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Žádné spojení k %1 v <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<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>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Úspěch.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync nemůže vytvořit zámek.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Modul %1 pro csync nelze načíst.<br/>Zkontrolujte prosím instalaci!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Systémový čas na klientovi je rozdílný od systémového času serveru. Použijte, prosím, službu synchronizace času (NTP) na serveru i klientu, aby byl čas na obou strojích stejný.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync nemohl detekovat typ souborového systému.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync obdrželo chybu při zpracování vnitřních struktur.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync se nezdařilo rezervovat paměť.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync: kritická chyba parametrů.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync se nezdařilo zpracovat krok aktualizace.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync se nezdařilo zpracovat krok sladění.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync se nezdařilo zpracovat krok propagace.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Cílový adresář neexistuje.</p><p>Zkontrolujte, prosím, nastavení synchronizace.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Vzdálený soubor nelze zapsat. Ověřte prosím vzdálený přístup.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Do místního souborového systému nelze zapisovat. Ověřte, prosím, přístupová práva.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync se nezdařilo připojit skrze proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync se nemohlo přihlásit k proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync se nezdařilo najít proxy server nebo cílový server.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync se nezdařilo přihlásit k serveru %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync selhalo z důvodu nezpracovaného odmítnutí práv.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync se pokusilo vytvořit adresář, který již existuje.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Nedostatek volného místa na serveru %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Nespecifikovaná chyba CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Položka nebyla synchronizována kvůli předchozím chybám:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Soubor se nachází na seznamu ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync se nezdařilo připojit k síti.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis v lokální synchronizované složce.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync se nepodařilo zapsat do souboru žurnálu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Došlo k vypršení časového limitu síťového spojení.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Nastala chyba HTTP přenosu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync se nezdařil přístup</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Zrušeno uživatelem</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Nastala vnitřní chyba číslo %1.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<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="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Soubor %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Soubor %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>staženo</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>odstraněno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>aktualizováno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>přejmenováno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>přesunuto</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 do %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' byl %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Soubory %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation> '%1' a %2 dalších souborů bylo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -1394,40 +1394,27 @@ Nedoporučuje se jí používat.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronizace zrušena uživatelem.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Soubor by odebrán ze sdílení pouze pro čtení. Soubor byl obnoven.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Soubor by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -1435,36 +1422,62 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Nepodařilo se odstranit adresář %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Místní soubor byl změněn během synchronizace, bude sesynchronizán, jakmile bude kompletní</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronizace zrušena uživatelem.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1821,6 +1834,14 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2142,27 +2163,27 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2218,7 +2239,7 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Kontext</translation>
</message>
@@ -2244,7 +2265,7 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>smazáno</translation>
</message>
@@ -2255,46 +2276,46 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<translation>Přesunuto do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>stahování</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>odesílání</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>neaktivní</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>spouštění</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>dokončeno</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>smazat</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>přesunout</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>přesunut</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 64819f5..e5de4b3 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -145,7 +145,7 @@
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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
@@ -165,12 +165,12 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 von %2 (%3%) benutzt.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbunden mit <a href="%1">%2</a>.</translation>
</message>
@@ -190,32 +190,32 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Vollständig</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 von %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Vollständig abgeschlossen.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Keine Verbindung mit %1 zu <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
@@ -231,178 +231,178 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Erfolgreich</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync konnte keine lock-Datei erstellen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Das %1-Plugin für csync konnte nicht geladen werden.<br/>Bitte überprüfen Sie die Installation!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Die Uhrzeit auf diesem Klienten und dem Server sind verschieden. Bitte verwenden Sie ein Zeitsynchronisationsprotokolls (NTP) auf Ihrem Server und Klienten, damit die gleiche Uhrzeit verwendet wird.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync konnte den Typ des Dateisystem nicht feststellen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync hatte einen Fehler bei der Verarbeitung von internen Strukturen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync konnte keinen Speicher reservieren.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync Verarbeitungsschritt "Übertragung" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Das Zielverzeichnis existiert nicht.</p><p>Bitte prüfen Sie die Synchronisationseinstellungen.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Eine Remote-Datei konnte nicht geschrieben werden. Bitte den Remote-Zugriff überprüfen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Kann auf dem lokalen Dateisystem nicht schreiben. Bitte Berechtigungen überprüfen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync konnte sich nicht über einen Proxy verbinden.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync konnte sich nicht am Proxy authentifizieren.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync konnte den Proxy oder Server nicht auflösen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync konnte sich nicht am Server %1 authentifizieren.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync versuchte, ein Verzeichnis zu erstellen, welches bereits existiert.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Kein Platz auf Server %1 frei.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync unbekannter Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Die Datei ist in der Ignorierliste geführt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync konnte sich nicht mit dem Netzwerk verbinden.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSync konnte den Synchronisationsbericht nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte auf das lokale Synchronisationsverzeichnis haben.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync konnte den Synchronisationsbericht nicht schreiben.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Es ist zu einer Zeitüberschreitung der Netzwerkverbindung gekommen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Es hat sich ein HTTP-Übertragungsfehler ereignet.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync-Zugriff fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Abbruch durch den Benutzer</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Interne Fehlernummer %1 aufgetreten.</translation>
</message>
@@ -438,90 +438,90 @@ 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="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Kann keinen CSync-Kontext erstellen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Datei %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Datei %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>Heruntergeladen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>Entfernt</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>Aktualisiert</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>Umbenannt</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>verschoben</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 nach %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' wurde %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Dateien %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' und %2 andere Dateien wurden %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -530,17 +530,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1395,40 +1395,27 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Eine Datei wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
@@ -1436,36 +1423,62 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Verzeichnis %1 konnte nicht entfernt werden</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Eine lokale Datei wurde während der Synchronisation geändert, synchronisieren Sie nochmals sobald die aktuelle Datei vollständig angekommen ist</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1821,6 +1834,14 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2142,27 +2163,27 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2218,7 +2239,7 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Kontext</translation>
</message>
@@ -2244,7 +2265,7 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>gelöscht</translation>
</message>
@@ -2255,46 +2276,46 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<translation>Verschoben nach %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>Herunterladen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>Lade hoch</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>Inaktiv</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>Starte</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>abgeschlossen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>löschen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>verschiebe</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>verschoben</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index b035c11..440028a 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -144,7 +144,7 @@
<translation><p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του πελάτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Δεν υπάρχει σύνδεση με το %1.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 από %2 (%3%) σε χρήση.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Ολοκληρωτικά</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 από %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Ολοκληρώθηκε.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Δεν ήταν δυνατή σύνδεση με το %1 στο <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Επιτυχία.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>Το CSync απέτυχε να δημιουργήσει ένα αρχείο κλειδώματος.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation>Το πρόσθετο του %1 για το csync δεν μπόρεσε να φορτωθεί.<br/>Παρακαλούμε επαληθεύσετε την εγκατάσταση!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Η ώρα του συστήματος μεταξύ του τοπικού υπολογιστή και του διακομιστή διαφέρει πάρα πολύ. Παρακαλούμε χρησιμοποιήστε μια υπηρεσία συγχρονισμός του χρόνου (NTP) και στους δύο υπολογιστές.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>To CSync δεν μπορούσε να ανιχνεύσει τον τύπο του αρχείου συστήματος.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>Το CSync απέτυχε να διατηρήσει τη μνήμη.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync μοιραίο σφαλμα παράμετρου.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync ενημέρωση στάδιο επεξεργασίας απέτυχε. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Η προώθηση του CSync απέτυχε.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Ο στοχευμένος κατάλογος δεν υπάρχει.</p><p>Παρακαλώ ελέγξτε τις ρυθμίσεις συγχρονισμού.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Ένα απομακρυσμένο αρχείο δεν μπόρεσε να επεξεργαστεί. Παρακαλούμε ελέγξτε την απομακρυσμένη πρόσβαση.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Το τοπικό σύστημα αρχείων δεν μπορεί να εγγράψει. Παρακαλούμε ελέγξτε τα δικαιώματα.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>Το CSync απέτυχε να συνδεθεί μέσω ενός proxy. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync αδυναμία ελέγχου ταυτότητας στο διακομιστή μεσολάβησης.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync απέτυχε να lookup μεσολάβησης ή διακομιστή. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync απέτυχε τον έλεγχο ταυτότητας στο 1% διακομιστή. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync απέτυχε λόγω μη γίνεται deniend άδεια. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>Το CSync προσπαθησε να δημιουργησει εναν χωρο αποθηκευσης που υπηρχε ηδη.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Δεν υπαρχει διαθεσιμος χωρος στον %1 διακομιστη.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync αγνωστο σφαλμα.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Αυτό το αντικείμενο δεν θα συγχρονιστεί λόγω προηγούμενων σφαλμάτων:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταλόγου. Βεβαιωθείτε ότι έχετε άδειες ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>Το CSync απέτυχε να εγγράψει στο αρχείο καταλόγου.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Συνέβη ένα χρονικό όριο σύνδεσης δικτύου. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Ένα εσωτερικό σφάλμα με αριθμό %1 συνέβη.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Αδυναμία δημιουργίας πλαισίου csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Αρχείο %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Αρχείο %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>κατέβηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>αφαιρέθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>ενημερώθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>μετονομάστηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>μετακινήθηκαν</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 προς %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>Το '%1' %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Αρχεία %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>Τα '%1' και άλλα %2 αρχεία %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -1394,40 +1394,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Το αρχείο διαγράφηκε από ένα διαμοιρασμένο κατάλογο χωρίς άδεια εγγραφής. Το αρχείο επαναφέρθηκε.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Ένα αρχείο διαγράφηκε από ένα διαμοιρασμένο κατάλογο χωρίς άδεια εγγραφής, αλλά η επαναφορά απέτυχε: %1</translation>
- </message>
-</context>
-<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>αδυναμία δημιουργίας καταλόγου %1</translation>
</message>
@@ -1435,36 +1422,62 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Αδυναμία αφαίρεσης καταλόγου %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε το ξανά Κοινόχρηστος.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού, θα συγχρονιστεί και πάλι όταν φτάσει πλήρως</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1819,6 +1832,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2140,27 +2161,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2238,7 +2259,7 @@ Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Πλαίσιο</translation>
</message>
@@ -2264,7 +2285,7 @@ Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>διαγράφηκε</translation>
</message>
@@ -2275,46 +2296,46 @@ Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.
<translation>Μετακινήθηκαν στο %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>λήψη</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>μεταφόρτωση</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>ανενεργό</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>έναρξη</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>ολοκληρώθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>διαγραφή</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>μετακινήστε</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>μετακινήθηκαν</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index efb444b..1078256 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -146,7 +146,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
@@ -166,12 +166,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
@@ -191,32 +191,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
@@ -232,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation type="unfinished"></translation>
</message>
@@ -439,106 +439,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -1389,80 +1389,93 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1811,6 +1824,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2132,27 +2153,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation type="unfinished"></translation>
</message>
@@ -2208,7 +2229,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"></translation>
</message>
@@ -2234,7 +2255,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -2245,46 +2266,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 15bda31..4cb090d 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 de %2 (%3%) en uso.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 de %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Finalizado</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Sin conexión a %1 en <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Completado con éxito.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync no pudo crear un fichero de bloqueo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>El %1 complemente para csync no se ha podido cargar.<br/>Por favor, verifique la instalación</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>La hora del sistema en este cliente es diferente de la hora del sistema en el servidor. Por favor use un servicio de sincronización de hora (NTP) en los servidores y clientes para que las horas se mantengan idénticas.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync no pudo detectar el tipo de sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync encontró un error mientras procesaba los árboles de datos internos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>Fallo al reservar memoria para Csync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>El proceso de actualización de CSync ha fallado.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>Falló el proceso de composición de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Error en el proceso de propagación de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>El directorio de destino no existe.</p><p>Por favor verifique la configuración de sincronización.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>No se pudo escribir en un archivo remoto. Por favor, compruebe el acceso remoto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>No se puede escribir en el sistema de archivos local. Por favor, compruebe los permisos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync falló al realizar la conexión a través del proxy</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync no pudo autenticar el proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync falló al realizar la búsqueda del proxy</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync: Falló la autenticación con el servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync: Falló debido a un permiso denegado.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync trató de crear un directorio que ya existe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: No queda espacio disponible en el servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>El elemento no está sincronizado por errores previos:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los enlaces simbolicos no estan sopertados.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>El fichero está en la lista de ignorados</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync: Falló la conexión con la red.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync falló al escribir el archivo de diario.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Ha transcurrido el tiempo máximo de conexión a la red.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Ha ocurrido un error de transmisión HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>Error al acceder CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Ha ocurrido un error interno con número %1.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Archivo %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>Descargado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>eliminado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>Actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>Renombrado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' ha sido %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Archivos %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' y %2 otros archivos son %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1394,40 +1394,27 @@ No se recomienda usarlo.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>La sincronización ha sido Interrumpida por el usuario</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>El archivo fue retirado de una carpeta compartida en modo de solo lectura. El archivo ha sido restaurado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Un archivo fue retirado de una carpeta compartida en modo de solo lectura, pero su restauración falló: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>No se pudo crear el directorio %1</translation>
</message>
@@ -1435,36 +1422,62 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>No se pudo eliminar el directorio %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Fichero local modificado mientras se sincronizaba, sincronice otra vez cuando termine de editar</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>La sincronización ha sido Interrumpida por el usuario</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1820,6 +1833,14 @@ Por favor asegurese de que la conexión de red está trabajando.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2141,27 +2162,27 @@ Por favor asegurese de que la conexión de red está trabajando.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2217,7 +2238,7 @@ Por favor asegurese de que la conexión de red está trabajando.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Contexto</translation>
</message>
@@ -2243,7 +2264,7 @@ Por favor asegurese de que la conexión de red está trabajando.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>borrado</translation>
</message>
@@ -2254,46 +2275,46 @@ Por favor asegurese de que la conexión de red está trabajando.</translation>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>subiendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inactivo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>iniciando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>finalizado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>eliminar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>mover</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>movido</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 452a28b..aea5b48 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 de %2(%3) en uso.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 de %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Completamente terminado.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Sin conexión a %1 en <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Éxito.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>Se registró un error en CSync cuando se intentaba crear un archivo de bloqueo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>No fue posible cargar el plugin de %1 para csync.<br/>Por favor, verificá la instalación</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>La hora del sistema en este cliente es diferente de la hora del sistema en el servidor. Por favor, usá un servicio de sincronización (NTP) de hora en las máquinas cliente y servidor para que las horas se mantengan iguales.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync no pudo detectar el tipo de sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync tuvo un error mientras procesaba los árboles de datos internos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falló al reservar memoria.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>Falló el proceso de actualización de CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>Falló el proceso de composición de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Proceso de propagación de CSync falló</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>El directorio de destino %1 no existe.</p> Por favor, comprobá la configuración de sincronización. </p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>No se puede escribir un archivo remoto. Revisá el acceso remoto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>No se puede escribir en el sistema de archivos local. Revisá los permisos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync falló al tratar de conectarse a través de un proxy</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync no pudo autenticar el proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync falló al realizar la busqueda del proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync: fallo al autenticarse en el servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync: Falló debido a un permiso denegado.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>Csync trató de crear un directorio que ya existía.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: No hay más espacio disponible en el servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Los items no fueron sincronizados por errores previos:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>El archivo está en la lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync: fallo al conectarse a la red</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Ha transcurrido el tiempo máximo de conexión a la red.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Ha ocurrido un error de transmisión HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync falló al acceder</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Error: ocurrió un error del tipo %1.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Archivo %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>descargado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>removido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>renombrado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' ha sido %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Archivos %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' y %2 otros archivos han sido %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1392,77 +1392,90 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Sincronizaciójn abortada por el usuario.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Los archivos locales han cambiado durante la sincronización, la primera vez ha funcionado completamente</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Sincronizaciójn abortada por el usuario.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1816,6 +1829,14 @@ Por favor asegúrese que su conexión de red esté en buen estado.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2138,27 +2159,27 @@ Por favor asegúrese que su conexión de red esté en buen estado.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2214,7 +2235,7 @@ Por favor asegúrese que su conexión de red esté en buen estado.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Contexto</translation>
</message>
@@ -2240,7 +2261,7 @@ Por favor asegúrese que su conexión de red esté en buen estado.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>borrado</translation>
</message>
@@ -2251,46 +2272,46 @@ Por favor asegúrese que su conexión de red esté en buen estado.</translation>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>subiendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inactivo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>iniciando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>finalizado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>borrar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>mover</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>movido</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index f340281..0c87d56 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>Kasutusel %1 / %2 (%3%)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ühendatud <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Täielikult</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 / %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Täielikult lõpetatud.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Ühendus puudub %1 at <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Korras.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync lukustusfaili loomine ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Ei suuda laadida csync lisa %1.<br/>Palun kontrolli paigaldust!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Kliendi arvuti kellaeg erineb serveri omast. Palun kasuta õige aja hoidmiseks kella sünkroniseerimise teenust (NTP) nii serveris kui kliendi arvutites, et kell oleks kõikjal õige.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync ei suutnud tuvastada failisüsteemi tüüpi.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync sai vea sisemiste andmestruktuuride töötlemisel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei suutnud mälu reserveerida.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parameetri saatuslik viga.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync uuendusprotsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync tasakaalustuse protsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync edasikandeprotsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Sihtkataloogi ei eksisteeri.</p><p>Palun kontrolli sünkroniseeringu seadistust</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Eemalolevasse faili ei saa kirjutada. Palun kontrolli kaugühenduse ligipääsu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Kohalikku failissüsteemi ei saa kirjutada. Palun kontrolli õiguseid.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync ühendus läbi puhverserveri ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync ei suutnud puhverserveris autoriseerida.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>Csync ei suuda leida puhverserverit.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync autoriseering serveris %1 ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync ebaõnnestus ligipääsu puudumisel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>Csync proovis tekitada kataloogi, mis oli juba olemas.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Serveris %1 on ruum otsas.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync tuvastamatu viga.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Fail on märgitud ignoreeritavate nimistus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync võrguga ühendumine ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>Csync ei suutnud avada või luua registri faili. Tee kindlaks et sul on õigus lugeda ja kirjutada kohalikus sünkrooniseerimise kataloogis</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync ei suutnud luua registri faili.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Toimus võrgukatkestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP ülekande viga.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSyncile ligipääs ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Kasutaja poolt tühistatud</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Tekkis sisemine viga number %1.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Ei suuda luua csync-konteksti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Fail %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Fail %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>allalaaditud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>eemaldatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>uuendatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>ümber nimetatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>ümber tõstetud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 kuni %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' on olnud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Failid %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' ja %2 teist faili on olnud %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -1394,40 +1394,27 @@ Selle kasutamine pole soovitatav.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Sünkroniseering katkestati kasutaja poolt.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Fail oli kustutatud kirjutamisõiguseta kataloogist, kuid on nüüd taastatud.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Fail oli eemaldatud kirjutamisõiguseta kataloogist ning taastamine ebaõnnestus: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>ei suuda luua kataloogi %1</translation>
</message>
@@ -1435,36 +1422,62 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Kausta %1 ei saa eemaldada</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Kohalik fail muutus sünkroniseerimise ajal, sünkroniseerin kuni ülekanne on täielik</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Sünkroniseering katkestati kasutaja poolt.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1820,6 +1833,14 @@ Palun veendu, et võrguühendus toimib.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2141,27 +2162,27 @@ Palun veendu, et võrguühendus toimib.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2217,7 +2238,7 @@ Palun veendu, et võrguühendus toimib.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Kontekst</translation>
</message>
@@ -2243,7 +2264,7 @@ Palun veendu, et võrguühendus toimib.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>kustutatud</translation>
</message>
@@ -2254,46 +2275,46 @@ Palun veendu, et võrguühendus toimib.</translation>
<translation>Tõstetud %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>allalaadimine</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>üleslaadimine</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>passiivne</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>alustamine</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>lõpetatud</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>kustuta</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>tõsta ümber</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>ümber tõstetud</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 1ead8c1..bf05a34 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a>ra konektatuta.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Guztiz</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Guztiz bukatuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Arrakasta.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSyncek huts egin du lock fitxategia sortzean.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>csyncen %1 plugina ezin da kargatu.<br/>Mesedez egiaztatu instalazioa!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Bezero honetako sistemaren ordua zerbitzariarenaren ezberdina da. Mesedez erabili sinkronizazio zerbitzari bat (NTP) zerbitzari eta bezeroan orduak berdinak izan daitezen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSyncek ezin du fitxategi sistema mota antzeman.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSyncek errorea izan du barne zuhaitzak prozesatzerakoan.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncek huts egin du memoria alokatzean.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parametro larri errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync prozesatzearen eguneratu urratsak huts egin du.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync prozesatzearen berdinkatze urratsak huts egin du.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync prozesatzearen hedatu urratsak huts egin du.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Helburu direktorioa ez da existitzen.</p><p>Egiazt6atu sinkronizazio konfigurazioa.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Urruneko fitxategi bat ezin da idatzi. Mesedez egiaztatu urreneko sarbidea.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Ezin da idatzi bertako fitxategi sisteman. Mesedez egiaztatu baimenak.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSyncek huts egin du proxiaren bidez konektatzean.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSyncek huts egin du zerbitzaria edo proxia bilatzean.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSyncek huts egin du %1 zerbitzarian autentikatzean.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSyncek dagoeneko existitzen zen karpeta bat sortzen saiatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Ez dago lekurik %1 zerbitzarian.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSyncen zehaztugabeko errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSyncek sarera konektatzean huts egin du.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Sarearen konexioan denbora-muga gertatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP transmisio errore bat gertatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Erabiltzaileak bertan behera utzita</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Barne errore bat gertatu da, zenbakia %1.</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>%1 Fitxategia: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>%1 Fitxategia</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>deskargatuta</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>ezabatuta</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>eguneratuta</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>berrizendatuta</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>mugitua</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' '%2' izan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -1387,77 +1387,90 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1809,6 +1822,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2130,27 +2151,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2206,7 +2227,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"/>
</message>
@@ -2232,7 +2253,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>ezabatuta</translation>
</message>
@@ -2243,46 +2264,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>deskargatzen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>igotzen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>hasten</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>bukatuta</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>ezabatu</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>mugitu</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>mugituta</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index b16fc45..e232274 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
@@ -164,12 +164,12 @@
<translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -189,32 +189,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>موفقیت</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync موفق به ایجاد یک فایل قفل شده، نشد.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>ماژول %1 برای csync نمی تواند بارگذاری شود.<br/>لطفا نصب را بررسی کنید!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>سیستم زمان بر روی این مشتری با سیستم زمان بر روی سرور متفاوت است.لطفا از خدمات هماهنگ سازی زمان (NTP) بر روی ماشین های سرور و کلاینت استفاده کنید تا زمان ها یکسان باقی بمانند.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync نوع فایل های سیستم را نتوانست تشخیص بدهد.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync موفق به رزرو حافظه نشد است.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>مرحله گسترش پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>پوشه هدف وجود ندارد.</p><p>لطفا راه اندازی همگام سازی را بررسی کنید.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>یک فایل از راه دور نمی تواند نوشته شود. لطفا دسترسی از راه دور را بررسی نمایید.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>بر روی فایل سیستمی محلی نمی توانید چیزی بنویسید.لطفا مجوزش را بررسی کنید.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>عدم موفقیت CSync برای اتصال از طریق یک پروکسی.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>عدم موفقیت CSync برای مراجعه به پروکسی یا سرور.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>عدم موفقیت CSync برای اعتبار دادن در %1 سرور.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>خطای نامشخص CSync </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>عدم موفقیت CSync برای اتصال به شبکه.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>اتصال به یک شبکه متوقف شده است.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>خطا در انتقال HTTP اتفاق افتاده است.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>یک خطای داخلی به شماره ی %1 اتفاق افتاد.</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1387,80 +1387,93 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1809,6 +1822,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2130,27 +2151,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation type="unfinished"/>
</message>
@@ -2206,7 +2227,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"/>
</message>
@@ -2232,7 +2253,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>حذف شده</translation>
</message>
@@ -2243,46 +2264,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>پاک کردن</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index cf71eac..0ec83e8 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1/%2 (%3 %) käytössä.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Muodosta yhteys - <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4/%5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Kokonaan valmis.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Onnistui.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>Csync ei onnistunut luomaan lukitustiedostoa.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>%1-liitännäistä csyncia varten ei voitu ladata.<br/>Varmista asennuksen toimivuus!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Tämän koneen järjestelmäaika on erilainen verrattuna palvelimen aikaan. Käytä NTP-palvelua kummallakin koneella, jotta kellot pysyvät samassa ajassa. Muuten tiedostojen synkronointi ei toimi.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>Csync-synkronointipalvelu ei kyennyt tunnistamaan tiedostojärjestelmän tyyppiä.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Csync-synkronointipalvelussa tapahtui virhe sisäisten puurakenteiden prosessoinnissa.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei onnistunut varaamaan muistia.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Kohdekansiota ei ole olemassa.</p><p>Tarkasta synkronointiasetuksesi.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Etätiedostoa ei pystytä kirjoittamaan. Tarkista, että etäpääsy toimii.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Paikalliseen tiedostojärjestelmään kirjoittaminen epäonnistui. Tarkista kansion oikeudet.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync ei onnistunut muodostamaan yhteyttä välityspalvelimen välityksellä.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync yritti luoda olemassa olevan kansion.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: %1-palvelimella ei ole tilaa vapaana.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync - määrittämätön virhe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Kohde ei ole synkronoitu aiempien virheiden vuoksi:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ei onnistunut yhdistämään verkkoon.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Verkon aikakatkaisuvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Tapahtui HTTP-välitysvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Tapahtui sisäinen virhe %1.</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Tiedosto %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Tiedosto %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>ladattu</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>poistettu</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>päivitetty</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>nimetty uudelleen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>siirretty</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' on %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Tiedostot %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' ja %2 muuta tiedostoa on %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -1388,40 +1388,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1429,39 +1416,65 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Kansion %1 poistaminen epäonnistui</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1810,6 +1823,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2131,27 +2152,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 Tt</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 Gt</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 Mt</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kt</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 t</translation>
</message>
@@ -2207,7 +2228,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"/>
</message>
@@ -2233,7 +2254,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>poistettu</translation>
</message>
@@ -2244,46 +2265,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>ladataan</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>lähetetään</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>poista</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>siirretty</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 0a83714..ec4dd8a 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
@@ -164,12 +164,12 @@
<translation>La synchronisation est en cours.<br/>Voulez-vous y mettre un terme?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 of %2 (%3%) occupés.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connecté à <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Complètement</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 de %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Complètement terminé.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Aucune connexion à %1 pour <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Succès.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync n'a pas pu créer le fichier de verrouillage.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Le plugin %1 pour csync n'a pas pu être chargé.<br/>Merci de vérifier votre installation !</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>L'heure du client est différente de l'heure du serveur. Veuillez utiliser un service de synchronisation du temps (NTP) sur le serveur et le client afin que les horloges soient à la même heure.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync n'a pas pu détecter le type de système de fichier.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync obtient une erreur pendant le traitement des arbres internes.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>Erreur lors de l'allocation mémoire par CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Erreur fatale CSync : mauvais paramètre.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>Erreur CSync lors de l'opération de mise à jour</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>Erreur CSync lors de l'opération d'harmonisation</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Erreur CSync lors de l'opération de propagation</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Le répertoire cible n'existe pas.</p><p>Veuillez vérifier la configuration de la synchronisation.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Un fichier distant ne peut être écrit. Veuillez vérifier l’accès distant.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Le système de fichiers local n'est pas accessible en écriture. Veuillez vérifier les permissions.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync n'a pu établir une connexion à travers un proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync ne peut s'authentifier auprès du proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync n'a pu trouver un proxy ou serveur auquel se connecter.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync n'a pu s'authentifier auprès du serveur %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync a échoué en raison d'une erreur de permission non prise en charge.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync a tenté de créer un répertoire déjà présent.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync : Aucun espace disponibla sur le serveur %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Erreur CSync inconnue.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Cet élément n'a pas été synchronisé en raison des erreurs précédentes :</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Les liens symboliques ne sont pas supportés par la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Le fichier est présent dans la liste de fichiers à ignorer.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync n'a pu établir une connexion au réseau.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture/écriture dans le répertoire de synchronisation local.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync n’a pu écrire le fichier de journalisation.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Le temps d'attente pour la connexion réseau s'est écoulé.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Une erreur de transmission HTTP s'est produite.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>Echec de CSync pour accéder</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Abandonné par l'utilisateur</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Une erreur interne numéro %1 est survenue.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<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="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Fichier %1 : %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Fichier %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>téléchargé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>supprimé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>mis à jour</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>renommé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>déplacé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 à %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' a été %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Fichiers %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' et %2 autres fichiers ont été %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -1394,40 +1394,27 @@ Il est déconseillé de l'utiliser.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>La synchronisation a été interrompue par l'utilisateur.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Ce fichier a été retiré d’un partage en lecture seule. Il a été restauré.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Un fichier a été retiré d’un partage en lecture seule, mais sa restauration a échoué : %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>impossible de créer le répertoire %1</translation>
</message>
@@ -1435,36 +1422,62 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Impossible de supprimer le dossier %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Fichier local modifié pendant la synchronisation, la synchronisation redémarrera lorsque ce sera terminé</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>La synchronisation a été interrompue par l'utilisateur.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1820,6 +1833,14 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2141,27 +2162,27 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TO</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GO</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MO</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kO</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 Octets</translation>
</message>
@@ -2217,7 +2238,7 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Contexte</translation>
</message>
@@ -2243,7 +2264,7 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>supprimé</translation>
</message>
@@ -2254,46 +2275,46 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
<translation>Déplacé vers %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>téléchargement</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>téléversement</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inactif</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>démarrage</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>terminé</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>supprimer</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>déplacer</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>déplacé</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 78fb504..890a832 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Estase realizando a sincronización.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>Usado %1 de %2 (%3%).</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Completado</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 de %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Totalmente terminada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Sen conexión con %1 en <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<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>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Correcto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>Produciuse un fallo en CSync ao crear un ficheiro de bloqueo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Non foi posíbel cargar o engadido %1 para CSync.<br/>Verifique a instalación!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>A diferenza de tempo neste cliente e diferente do tempo do sistema no servidor. Use o servido de sincronización de tempo (NTP) no servidor e nas máquinas cliente para que os tempos se manteñan iguais.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync non pode detectar o tipo de sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync tivo un erro ao procesar árbores internas.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>Produciuse un fallo ao reservar memoria para CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Produciuse un erro fatal de parámetro CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>Produciuse un fallo ao procesar o paso de actualización de CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>Produciuse un fallo ao procesar o paso de reconciliación de CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Produciuse un fallo ao procesar o paso de propagación de CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Non existe o directorio de destino.</p><p>Comprobe a configuración da sincronización.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Non é posíbel escribir un ficheiro remoto. Comprobe o acceso remoto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Non é posíbel escribir no sistema de ficheiros local. Comprobe os permisos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSYNC no puido conectarse a través dun proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync non puido autenticarse no proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSYNC no puido atopar o servidor proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync non puido autenticarse no servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>Produciuse un fallo en CSync por mor dun permiso denegado.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSYNC tenta crear un directorio que xa existe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Non hai espazo dispoñíbel no servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Produciuse un erro non especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>O elemento non foi sincronizado por mor dos erros anteriores:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSYNC no puido conectarse á rede.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>Produciuse un fallo do Csync ao cargar ou crear o ficheiro de rexistro. Asegúrese de que ten permisos de lectura e escritura no directorio de sincronización local.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>Produciuse un fallo en CSync ao escribir o ficheiro de rexistro.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Excedeuse do tempo de espera para a conexión á rede.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Produciuse un erro na transmisión HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>Produciuse un fallo ao acceder a CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrompido polo usuario</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Produciuse un erro interno número %1. </translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<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="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Ficheiro %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Ficheiro %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>descargado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>Retirado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>renomeado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 de %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>«%1» foi %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Ficheiros %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>«%1» e outros %2 ficheiros foron %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1394,40 +1394,27 @@ Recomendámoslle que non o use.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>A sincronización foi interrompida polo usuario.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>O ficheiro foi retirado da compartición de só lectura. O ficheiro foi restaurado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Un ficheiro foi retirado da compartición de só lectura, mais a restauración fracasou: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>non foi posíbel crear o directorio %1</translation>
</message>
@@ -1435,36 +1422,62 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Non foi posíbel retirar o directorio %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>O ficheiro local cambiou durante a sincronización, sincronizando unha vez quedou completado</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>A sincronización foi interrompida polo usuario.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1820,6 +1833,14 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2141,27 +2162,27 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2217,7 +2238,7 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Contexto</translation>
</message>
@@ -2243,7 +2264,7 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>eliminado</translation>
</message>
@@ -2254,46 +2275,46 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>enviando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inactivo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>iniciando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>rematado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>eliminar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>mover</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>movido</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index d9f0d43..be8f856 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
@@ -164,12 +164,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -189,32 +189,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Teljesen befejezve.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Sikerült.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>A CSync nem tudott létrehozni lock fájlt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Az %1 beépülőmodul a csync-hez nem tölthető be.<br/>Ellenőrizze a telepítést!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>A helyi rendszeridő különbözik a kiszolgáló rendszeridejétől. Használjon időszinkronizációs szolgáltatást (NTP) a rendszerén és a szerveren is, hogy az idő mindig megeggyezzen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>A CSync nem tudta megállapítani a fájlrendszer típusát.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>A CSync hibába ütközött a belső adatok feldolgozása közben.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>Hiba a CSync memórifoglalásakor.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hibás paraméterhiba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync frissítés feldolgozása meghíusult.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync egyeztetési lépés meghíusult.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync propagálási lépés meghíusult.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>A célmappa nem létezik.</p><p>Ellenőrizze a sync beállításait.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Egy távoli fájl nem írható. Kérlek, ellenőrizd a távoli elérést.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>A helyi fájlrendszer nem írható. Kérlek, ellenőrizd az engedélyeket.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync proxy kapcsolódási hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>A CSync nem találja a proxy kiszolgálót.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>A CSync nem tuja azonosítani magát a %1 kiszolgálón.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync hiba, nincs kezelési jogosultság.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>A CSync megpróbált létrehozni egy már létező mappát.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Nincs szabad tárhely az %1 kiszolgálón.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync ismeretlen hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync hálózati kapcsolódási hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Hálózati kapcsolat időtúllépési hiba lépett fel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP átviteli hiba történt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Belső hiba történt, száma: %1.</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>letöltva</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>eltávolítva</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>módosítva</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>átnevezve</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>mozgatva</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<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="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -1387,80 +1387,93 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1809,6 +1822,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2130,27 +2151,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2206,7 +2227,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"/>
</message>
@@ -2232,7 +2253,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>törölve</translation>
</message>
@@ -2243,46 +2264,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>letöltés folyamatban</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>feltöltés folyamatban</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inaktív</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>indítás folyamatban</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>befejeződött</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>töröl</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>mozgat</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>mozgatva</translation>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index cce62d3..fd54015 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 di %2 (%3%) utilizzati.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connesso a <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 di %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Terminata completamente.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Nessuna connessione a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Successo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync non è riuscito a creare il file di lock.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Il plugin %1 per csync non può essere caricato.<br/>Verifica l'installazione!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>L'ora di sistema su questo client è diversa dall'ora di sistema del server. Usa un servizio di sincronizzazione dell'orario (NTP) sul server e sulle macchine client in modo che l'ora sia la stessa.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync non è riuscito a individuare il tipo di filesystem.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Errore di CSync durante l'elaborazione degli alberi interni.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync non è riuscito a riservare la memoria.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Errore grave di parametro di CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>La fase di aggiornamento di CSync non è riuscita.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>La fase di riconciliazione di CSync non è riuscita.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>La fase di propagazione di CSync non è riuscita.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>La cartella di destinazione non esiste.</p><p>Controlla la configurazione della sincronizzazione.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Un file remoto non può essere scritto. Controlla l'accesso remoto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Il filesystem locale non può essere scritto. Controlla i permessi.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync non è riuscito a connettersi tramite un proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync non è in grado di autenticarsi al proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync non è riuscito a trovare un proxy o server.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync non è riuscito ad autenticarsi al server %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>Problema di CSync dovuto alla mancata gestione dei permessi.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync ha cercato di creare una cartella già esistente.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: spazio insufficiente sul server %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Errore non specificato di CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Questo oggetto non è stato sincronizzato a causa di errori precedenti:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Il file è stato aggiunto alla lista ignorati.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync non è riuscito a connettersi alla rete.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSync non è riuscito a caricare o a creare il file journal. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync non è riuscito a scrivere il file journal.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Si è verificato un timeout sulla connessione alla rete.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Si è verificato un errore di trasmissione HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync non è riuscito ad accedere</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrotto dall'utente</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>SI è verificato un errore interno numero %1</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Impossibile creare il contesto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>File %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>File %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>scaricato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>rimosso</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>aggiornato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>rinominato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>spostato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>Da %1 a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' è stato %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>File %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' e %2 altri file sono stati %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -1393,40 +1393,27 @@ Non è consigliabile utilizzarlo.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Sincronizzazione interrotta dall'utente.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Nessun E-Tag ricevuto dal server, controlla il Proxy/Gateway</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Il file è stato rimosso da una condivisione in sola lettura. Il file è stato ripristinato.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Un file è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -1434,36 +1421,62 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Impossibile rimuovere la cartella %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Un file locale è cambiato durante la sincronizzazione, riprova più tardi.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Sincronizzazione interrotta dall'utente.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1819,6 +1832,14 @@ Assicurati che la tua connessione sia funzionante.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2140,27 +2161,27 @@ Assicurati che la tua connessione sia funzionante.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2216,7 +2237,7 @@ Assicurati che la tua connessione sia funzionante.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Contesto</translation>
</message>
@@ -2242,7 +2263,7 @@ Assicurati che la tua connessione sia funzionante.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>eliminati</translation>
</message>
@@ -2253,46 +2274,46 @@ Assicurati che la tua connessione sia funzionante.</translation>
<translation>Spostato in %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>scaricamento in corso</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>caricamento in corso</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inattivo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>avvio in corso</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>completato</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>elimina</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>sposta</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>spostato</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 87000e8..082297b 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -144,7 +144,7 @@
<translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
@@ -164,12 +164,12 @@
<translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 / %2 (%3%) を使用中です。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> へ接続しました。</translation>
</message>
@@ -189,32 +189,32 @@
<translation>完全に</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 of %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>完全に終了しました。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>%1 に接続していません: <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSyncがロックファイルの作成に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>csync 用の %1 プラグインをロードできませんでした。<br/>インストール状態を確認してください！</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>このクライアントのシステム時刻はサーバーのシステム時刻と異なります。時刻が同じになるように、クライアントとサーバーの両方で時刻同期サービス(NTP)を実行してください。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSyncはファイルシステムタイプを検出できませんでした。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncで使用するメモリの確保に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSyncの致命的なパラメータエラーです。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSyncの処理ステップの更新に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSyncの処理ステップの調停に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSyncの処理ステップの伝播に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>ターゲットディレクトリは存在しません。</p><p>同期設定を確認してください。</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>リモートファイルは書き込みできません。リモートアクセスをチェックしてください。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>ローカルファイルシステムは書き込みができません。パーミッションをチェックしてください。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSyncがプロキシ経由での接続に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSyncはそのプロキシで認証できませんでした。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSyncはプロキシもしくはサーバーの参照に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSyncは %1 サーバーでの認証に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSyncはすでに存在するディレクトリを作成しようとしました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSyncの未指定のエラーです。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>前にエラーが発生したため、対象アイテムは同期されていません:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期の際にシンボリックリンクはサポートしていません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>対象ファイルは無視した一覧に登録しています</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSyncはネットワークへの接続に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期ディレクトリに読み書きの権限があるか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSyncはジャーナルファイルの書き込みに失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>ネットワーク接続のタイムアウトが発生しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTPの伝送エラーが発生しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync はアクセスに失敗しました</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>ユーザーによって中止されました</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>内部エラー番号 %1 が発生しました。</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>csync-context を作成できません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>ファイル %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>ファイル %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>ダウンロード完了</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>アップデート済</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>名前変更</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>移動</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 から %2 へ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' は %2 です。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>ファイル %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' と %2 個のファイルは %3 です。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -1393,40 +1393,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>同期はユーザーによって中止されました。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
- </message>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>ファイルは読み込み専用の共有から削除されました。ファイルは復元されます。</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>ファイルは読み込み専用の共有から削除されましたが、ファイルの復元に失敗しました: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>ディレクトリ %1 を作成できませんでした</translation>
</message>
@@ -1434,36 +1421,62 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>ディレクトリ %1 を削除できません</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>同期中にローカルファイルが変更されました。完了してからもう一度同期してください。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>同期はユーザーによって中止されました。</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1819,6 +1832,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2140,27 +2161,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2216,7 +2237,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>コンテキスト</translation>
</message>
@@ -2242,7 +2263,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>削除</translation>
</message>
@@ -2253,46 +2274,46 @@ Please ensure that your network connection is working.</source>
<translation>%1 へ移動完了</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>ダウンロード中</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>アップロード中</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>無効</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>開始</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>終了</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>移動</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>移動</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index da1ee86..4b7708b 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 van %2 (%3%) in gebruik.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbonden met <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Volledig</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 van %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Helemaal klaar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Geen verbinding met %1 op <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<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>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Succes.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync kon geen lock file maken.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>De %1 plugin voor csync kon niet worden geladen.<br/>Verifieer de installatie!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>De systeemtijd van deze client wijkt af van de systeemtijd op de server. Gebruik een tijdsynchronisatieservice (NTP) op zowel de server als de client, zodat de machines dezelfde systeemtijd hebben.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync kon het soort bestandssysteem niet bepalen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync kreeg een fout tijdens het verwerken van de interne mappenstructuur.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync kon geen geheugen reserveren.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatale parameter fout.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync verwerkingsstap bijwerken mislukt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync verwerkingsstap verzamelen mislukt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync verwerkingsstap doorzetten mislukt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>De doelmap bestaat niet.</p><p>Controleer de synchinstellingen.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Een extern bestand kon niet worden weggeschreven. Controleer de externe rechten.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Er kan niet worden geschreven naar het lokale bestandssysteem. Controleer de schrijfrechten.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync kon niet verbinden via een proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync kon niet authenticeren bij de proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync kon geen proxy of server vinden.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync kon niet authenticeren bij de %1 server.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync probeerde een al bestaande directory aan te maken.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Geen ruimte op %1 server beschikbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync ongedefinieerde fout.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Dit object is niet gesynchroniseerd door eerdere fouten:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolic links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>De file is opgenomen op de negeerlijst.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync kon niet verbinden met het netwerk.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync kon het journal bestand niet wegschrijven.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>verbindingstime-out</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Er trad een HTTP transmissiefout plaats.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync kreeg geen toegang</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Afgebroken door de gebruiker</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Een interne fout met nummer %1 is opgetreden.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<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="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Bestand %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Bestand %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>gedownload</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>verwijderd</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>geüpdatet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>hernoemd</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>verplaatst</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 naar %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' was %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Bestanden %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' en %2 andere bestanden waren %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -1394,40 +1394,27 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronisatie afgebroken door gebruiker.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Het bestand was verwijderd van een alleen-lezen share. Het bestand is hersteld.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Een bestand is verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -1435,36 +1422,62 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Kon map %1 niet verwijderen</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Een lokaal bestand is gewijzigd tijdens het synchroniseren, wordt gesynchroniseerd als het volledig is aangekomen.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronisatie afgebroken door gebruiker.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1820,6 +1833,14 @@ Controleer de werking van uw netwerkverbinding.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2141,27 +2162,27 @@ Controleer de werking van uw netwerkverbinding.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2217,7 +2238,7 @@ Controleer de werking van uw netwerkverbinding.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Context</translation>
</message>
@@ -2243,7 +2264,7 @@ Controleer de werking van uw netwerkverbinding.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>verwijderd</translation>
</message>
@@ -2254,46 +2275,46 @@ Controleer de werking van uw netwerkverbinding.</translation>
<translation>Verplaatst naar %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>downloaden</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>uploaden</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inactief</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>beginnend</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>klaar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>verwijderen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>verplaatsen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>verplaatst</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 004d745..635a767 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 z %2 (%3%) w użyciu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Podłączony do <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Całkowicie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 z %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Całkowicie zakończony.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Brak połączenia do %1 w <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Sukces.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync nie mógł utworzyć pliku blokady.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Wtyczka %1 do csync nie może być załadowana.<br/>Sprawdź poprawność instalacji!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Czas systemowy na tym kliencie różni się od czasu systemowego na serwerze. Użyj usługi synchronizacji czasu (NTP) na serwerze i kliencie, aby czas na obu urządzeniach był taki sam.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync nie może wykryć typu systemu plików.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync napotkał błąd podczas przetwarzania wewnętrznych drzew.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync nie mógł zarezerwować pamięci.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Krytyczny błąd parametru CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>Aktualizacja procesu przetwarzania CSync nie powiodła się.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>Scalenie w procesie przetwarzania CSync nie powiodło się.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Propagacja w procesie przetwarzania CSync nie powiodła się.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Katalog docelowy nie istnieje.</p><p>Sprawdź ustawienia synchronizacji.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Zdalny plik nie może zostać zapisany. Sprawdź dostęp zdalny.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Nie można zapisywać na lokalnym systemie plików. Sprawdź uprawnienia.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync nie mógł połączyć się przez proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync nie mógł się uwierzytelnić przez proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync nie mógł odnaleźć serwera proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync nie mógł uwierzytelnić się na serwerze %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync nie obsługiwane, odmowa uprawnień.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync próbował utworzyć katalog, który już istnieje.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Brak dostępnego miejsca na serwerze %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Nieokreślony błąd CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Plik jest na liście plików ignorowanych.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync nie mógł połączyć się z siecią.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Upłynął limit czasu połączenia.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Wystąpił błąd transmisji HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>Synchronizacja nieudana z powodu braku dostępu</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Anulowane przez użytkownika</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Wystąpił błąd wewnętrzny numer %1.</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Nie można utworzyć kontekstu csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Plik %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Plik %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>Pobrane</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>Usunęte</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>zaktualizowane</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>Zmienione</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>przeniesione</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 do %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' został %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Pliki %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' i %2 inne pliki zostały %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -1390,40 +1390,27 @@ Niezalecane jest jego użycie.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronizacja anulowane przez użytkownika.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Plik został usunięty z udziału tylko do odczytu. Plik został przywrócony.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1431,36 +1418,62 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Nie mogę usunąć katalogu %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronizacja anulowane przez użytkownika.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1815,6 +1828,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2137,27 +2158,27 @@ Kliknij</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2213,7 +2234,7 @@ Kliknij</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Kontekst</translation>
</message>
@@ -2239,7 +2260,7 @@ Kliknij</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>usunięto</translation>
</message>
@@ -2250,46 +2271,46 @@ Kliknij</translation>
<translation>Przeniesione do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>pobieram</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>przesyłanie</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>nieaktywne</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>Uruchamiam</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>zakończony</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>usuń</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>przenieś</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>przeniesione</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index e939f98..ebaf5f4 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -189,32 +189,32 @@
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 de %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,179 +230,179 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Sucesso</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync falhou a criação do ficheiro de lock.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>O plugin %1 para o CSync não foi carregado.<br/>Por favor verifique a instalação!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>A data/hora neste cliente é difere da data/hora do servidor.
Por favor utilize um servidor de sincronização horária (NTP), no servidor e nos clientes para garantir que a data/hora são iguais.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>Csync não conseguiu detectar o tipo de sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Csync obteve um erro enquanto processava as árvores internas.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>O CSync falhou a reservar memória</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Parametro errado, CSync falhou</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>O passo de processamento do CSyn falhou</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync: Processo de reconciliação falhou.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync: O processo de propagação falhou.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>A pasta de destino não existe.</p><p>Por favor verifique a configuração da sincronização.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Não é possivel escrever num ficheiro remoto. Por favor verifique o acesso remoto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Não é possivel escrever no sistema de ficheiros local. Por favor verifique as permissões.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync: Erro a ligar através do proxy</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync: Erro a contactar o proxy ou o servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync: Erro a autenticar no servidor %1</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync: Erro devido a permissões de negação não tratadas.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>O CSync tentou criar uma pasta que já existe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Não ha espaço disponível no servidor %1</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync: erro não especificado</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync: Erro na conecção à rede</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Houve um erro de timeout de rede (fim de tempo)</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Ocorreu um erro de transmissão HTTP</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Ocorreu o erro interno %1.</translation>
</message>
@@ -438,106 +438,106 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Ficheiro %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Ficheiro %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>removido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>renomeado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Ficheiros %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1388,80 +1388,93 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1810,6 +1823,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2131,27 +2152,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2207,7 +2228,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Contexto</translation>
</message>
@@ -2233,7 +2254,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>apagado</translation>
</message>
@@ -2244,46 +2265,46 @@ Please ensure that your network connection is working.</source>
<translation>Movido para %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>A descarregar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>A carregar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>Inactivo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>A iniciar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>Concluído</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>apagar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>mover</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>movido</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 7ded957..2e28fec 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Sem %1 conexão configurada.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 de %2 (%3%) em uso.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado à <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 de %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Completamente finalizado.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Nenhuma conexão para %1 at <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<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>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>Falha ao criar o arquivo de trava pelo CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>O plugin %1 para csync não foi carregado.<br/>Por favor verifique a instalação!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>A hora do sistema neste cliente é diferente do que o tempo de sistema no servidor. Por favor, use um serviço de sincronização de tempo (NTP) no servidor e máquinas clientes para que os tempos continuam os mesmos.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>Tipo de sistema de arquivo não detectado pelo CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Erro do CSync enquanto processava árvores internas.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falhou ao reservar memória.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Erro fatal permanente do CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>Processamento da atualização do CSync falhou.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>Processamento da conciliação do CSync falhou.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Processamento da propagação do CSync falhou.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>O diretório de destino não existe.</p> <p>Por favor, verifique a configuração de sincronização. </p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>O arquivo remoto não pode ser escrito. Por Favor, verifique o acesso remoto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>O sistema de arquivos local não pode ser escrito. Por favor, verifique as permissões.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync falhou ao conectar por um proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>Csync não conseguiu autenticação no proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync falhou ao localizar o proxy ou servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync falhou ao autenticar no servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync falhou devido a uma negativa de permissão não resolvida.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync tentou criar um diretório que já existe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: sem espaço disponível no servidor %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Erro não especificado no CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>O item não está sincronizado devido a erros anteriores:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linques simbólicos não são suportados em sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>O arquivo está listado na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync falhou ao conectar à rede.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>Csync falhou ao carregar ou criar o arquivo jornal. Certifique-se de ter permissão de escrita no diretório de sincronização local.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>Csync falhou ao tentar gravar o arquivo jornal.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Atingido o tempo limite para conexão à rede.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Houve um erro na transmissão HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>Falha no acesso CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Abortado pelo usuário</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Um erro interno número %1 ocorreu.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<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="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Arquivo %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Arquivo %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>baixado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>removido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>atualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>renomeado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' foi %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Arquivos %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' e %2 outros arquivos foram %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -1392,40 +1392,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>A sincronização foi abortada pelo usuário.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>O arquivo foi removido de um compartilhamento somente de leitura. O arquivo foi restaurado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Um arquivo foi removido de um compartilhamento de somente leitura, mas a restauração falhou: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar diretório %1</translation>
</message>
@@ -1433,36 +1420,62 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>O diretório %1 não pode ser removido</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ele será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Arquivo local alterado durante a sincronização, sincronizando uma vez que chegou completamente</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>A sincronização foi abortada pelo usuário.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1818,6 +1831,14 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2139,27 +2160,27 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2215,7 +2236,7 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Contexto</translation>
</message>
@@ -2241,7 +2262,7 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>excluído</translation>
</message>
@@ -2252,46 +2273,46 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<translation>Movido para %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>baixando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>enviando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inativo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>iniciando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>finalizado</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>remover</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>mover</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>movido</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 36132e7..74f8eac 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -144,7 +144,7 @@
<translation><p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 из %2 (%3%) использовано.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Соединились с <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Полностью</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 из %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Полностью завершено.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Нет связи с %1 по адресу <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync не удалось создать файл блокировки.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>%1 плагин для синхронизации не удается загрузить.<br/>Пожалуйста, убедитесь, что он установлен!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Системное время на этом клиенте отличается от времени на сервере. Воспользуйтесь сервисом синхронизации времени (NTP) на серверной и клиентской машинах для установки точного времени.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync не удалось обнаружить тип файловой системы.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync получил сообщение об ошибке при обработке внутренних деревьев.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не удалось зарезервировать память.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Фатальная ошибка параметра CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>Процесс обновления CSync не удался.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>Процесс согласования CSync не удался.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Процесс передачи CSync не удался.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Целевая папка не существует.</p><p>Проверьте настройки синхронизации.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Удаленный файл не может быть записан. Пожалуйста, проверьте удаленный доступ.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Локальная файловая система не доступна для записи. Пожалуйста, проверьте права пользователя.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync не удалось подключиться через прокси.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не удалось авторизоваться на прокси сервере.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не удалось найти прокси сервер.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не удалось аутентифицироваться на сервере %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync упал в связи с отутствием обработки из-за отказа в доступе.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync пытался создать директорию, которая уже существует.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Нет доступного пространства на сервере %1 server.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Неизвестная ошибка CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Путь не синхронизируется из-за произошедших ошибок:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не удалось подключиться к сети.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSync не смог загрузить или создать файл журнала. Убедитесь что вы имеете права чтения и записи в локальной директории.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync не смог записать файл журнала.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Произошёл таймаут соединения сети.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Произошла ошибка передачи http.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync не имеет доступа</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Прервано пользователем</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Произошла внутренняя ошибка номер %1.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Невозможно создать контекст csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Файл %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Файл %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>скачано</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>удалено</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>обновлено</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>переименовано</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>перемещено</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 в %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>%1' был %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Файлы %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' и ещё %2 других файлов было %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -1394,40 +1394,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Синхронизация прервана пользователем.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
- </message>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Файл был удалён из опубликованной папки с правами только для чтения. Файл был восстановлен.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Файл был удалён из опубликованной папки с правами только для чтения, но восстановить его не удалось: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>не удалось создать директорию %1</translation>
</message>
@@ -1435,36 +1422,62 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Невозможно удалить директорию %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Локальный файл изменился в процессе синхронизации, повторяем процесс</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Синхронизация прервана пользователем.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1820,6 +1833,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2141,27 +2162,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 ТБ</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 ГБ</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 МБ</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 кБ</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 Б</translation>
</message>
@@ -2219,7 +2240,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Контекст</translation>
</message>
@@ -2245,7 +2266,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>удален</translation>
</message>
@@ -2256,46 +2277,46 @@ Please ensure that your network connection is working.</source>
<translation>Перемещено в %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>скачиваю</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>загружаю на сервер</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>неактивно</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>начинается</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>завершено</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>удалить</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>переместить</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>перемещено</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 045385a..5329e5a 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 of %2 (%3%) v používaní.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Pripojené k <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Úplne</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 z %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Úplne dokončené.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Žiadne pripojenie k %1 at <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<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>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Úspech.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>Vytvorenie "zamykacieho" súboru cez "CSync" zlyhalo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>%1 zásuvný modul pre "CSync" nebolo možné načítať.<br/>Prosím skontrolujte inštaláciu!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Systémový čas daného klienta je odlišný od systémového času na serveri. Prosím zvážte použitie sieťovej časovej synchronizačnej služby (NTP) na danom serveri a klientských strojoch, za účelom udržania rovnakého času.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>Detekcia súborového systému vrámci "CSync" zlyhala.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Spracovanie "vnútorných stromov" vrámci "CSync" zlyhalo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync sa nepodarilo zarezervovať pamäť.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync kritická chyba parametrov.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync sa nepodarilo spracovať krok aktualizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync sa nepodarilo spracovať krok zladenia.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync sa nepodarilo spracovať krok propagácie.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Cieľový priečinok neexistuje.</p><p>Skontrolujte, prosím, nastavenia synchronizácie.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Vzdialený súbor nie je možné zapísať. Prosím skontrolujte vzdialený prístup.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Do lokálneho súborového systému nie je možné zapisovať. Prosím skontrolujte povolenia.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync sa nepodarilo prihlásiť cez proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync sa nemohol prihlásiť k proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync sa nepodarilo nájsť proxy alebo server.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync sa nepodarilo prihlásiť na server %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync zlyhalo. Nedostatočné oprávnenie.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync sa pokúsil vytvoriť priečinok, ktorý už existuje.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Na serveri %1 nie je žiadne voľné miesto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync nešpecifikovaná chyba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Položka nebola synchronizovaná kvôli predchádzajúcim chybám:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nie sú podporované v synchronizácii.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Súbor je zapísaný na zozname ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť synchronizované medzi platformami.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync sa nepodarilo pripojiť k sieti.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Skončil časový limit sieťového pripojenia</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Chyba HTTP prenosu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync nepodaril prístup</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Zrušené používateľom</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Vyskytla sa interná chyba číslo %1.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Nemožno vytvoriť "csync-kontext"</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Súbor %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Súbor %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>stiahnuté</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>zmazané</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>aktualizované</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>premenované</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>presunuté</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 na %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' bol %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Súbory %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' a %2 ďalších súborov bolo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -1392,40 +1392,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronizácia zrušená používateľom.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>nepodarilo sa vytvoriť priečinok %1</translation>
</message>
@@ -1433,36 +1420,62 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Nemožno odstrániť priečinok %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Lokálny súbor bol počas synchronizácie zmenený, zosynchronizuje sa, akonáhle bude kompletný</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Synchronizácia zrušená používateľom.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1815,6 +1828,14 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2136,27 +2157,27 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2212,7 +2233,7 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Kontext</translation>
</message>
@@ -2238,7 +2259,7 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>zmazané</translation>
</message>
@@ -2249,46 +2270,46 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
<translation>Presunuté do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>sťahujem</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>nahrávam</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>neaktívny</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>začínam</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>dokončené</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>vymazať</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>presunúť</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>presunuté</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 689d677..ccaef9b 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljenih %1 povezav.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 od %2 (%3%) v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>V celoti</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 od %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>V celoti končano.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>Povezava z %1 ni vzpostavljena pri <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Uspešno vzpostavljeno.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>Ustvarjanje datoteke zaklepa s CSync je spodletelo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Vstavka %1 za CSync ni mogoče naložiti.<br/>Preveriti je treba namestitev!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Sistemski čas na odjemalcu ni skladen s sistemskim časom na strežniku. Priporočljivo je uporabiti storitev usklajevanja časa (NTP) na strežniku in odjemalcu. S tem omogočimo ujemanje podatkov o času krajevnih in oddaljenih datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>Zaznavanje vrste datotečnega sistema s CSync je spodletelo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Pri obdelavi notranje drevesne strukture s CSync je prišlo do napake.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>Vpisovanje prostora v pomnilniku za CSync je spodletelo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>Usodna napaka parametra CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>Korak opravila posodobitve CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>Korak opravila poravnave CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>Korak opravila razširjanja CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Ciljna mapa ne obstaja.</p><p>Preveriti je treba nastavitve usklajevanja.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Oddaljene datoteke ni mogoče zapisati. Najverjetneje je vzrok v oddaljenem dostopu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>V krajevni datotečni sistem ni mogoče pisati. Najverjetneje je vzrok v neustreznih dovoljenjih.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>Povezava CSync preko posredniškega strežnika je spodletel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>Overitev CSync na posredniškem strežniku je spodletela.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>Poizvedba posredniškega strežnika s CSync je spodletela.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>Overitev CSync pri strežniku %1 je spodletela.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>Delovanje CSync je zaradi neustreznih dovoljenj spodletelo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>Prišlo je do napake programa CSync zaradi poskusa ustvarjanja mape z že obstoječim imenom.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>Odziv CSync: na strežniku %1 ni razpoložljivega prostora.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Nedoločena napaka CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Predmet ni usklajen zaradi predhodnih napak:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Usklajevanje simbolnih povezav ni podprto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Datoteka je na seznamu prezrtih datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>Povezava CSync v omrežje je spodletela.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana posebna dovoljenja krajevne mape za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>Zapisovanje dnevniške datoteke s CSync je spodletelo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Poskus vzpostavitve povezave je časovno potekel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Prišlo je do napake med prenosom HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>Dostop s CSync je spodletel</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Prišlo je do notranje napake s številko %1.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<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="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Datoteka %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Datoteka %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>prejeta.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>odstranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>posodobljena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>preimenovana.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>premaknjeno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 vo %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>Datoteka '%1' je %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Datoteke %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' in %2 drugih datotek je %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -1394,40 +1394,27 @@ Uporaba ni priporočljiva.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Datoteka je bila odstranjena iz mesta v souporabi, vendar je uspešno obnovljena.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Datoteka je bila odstranjena iz mesta v souporabi, ki je le za branje, obnavljanje pa je spodletelo: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>ni mogoče ustvariti mape %1</translation>
</message>
@@ -1435,36 +1422,62 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>ni mogoče odstraniti mape %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Usklajevanje je prekinil uporabnik.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1820,6 +1833,14 @@ Prepričajte se, da je omrežna povezava omogočena in delujoča.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2141,27 +2162,27 @@ Prepričajte se, da je omrežna povezava omogočena in delujoča.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2217,7 +2238,7 @@ Prepričajte se, da je omrežna povezava omogočena in delujoča.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Vsebina</translation>
</message>
@@ -2243,7 +2264,7 @@ Prepričajte se, da je omrežna povezava omogočena in delujoča.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>izbrisano</translation>
</message>
@@ -2254,46 +2275,46 @@ Prepričajte se, da je omrežna povezava omogočena in delujoča.</translation>
<translation>Premaknjeno v %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>prejemanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>pošiljanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>nedejavno</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>začenjanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>končano</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>izbriši</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>premakni</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>premaknjeno</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 6e107b4..5534931 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ansluten till <a href="%1">%2</a>.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Fullständigt</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 av %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Helt klar.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync misslyckades med att skapa en låsfil.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Plugin %1 för csync kunde inte laddas.<br/>Var god verifiera installationen!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Systemtiden på denna klientdator är annorlunda än systemtiden på servern. Använd en tjänst för tidssynkronisering (NTP) på servern och alla klientdatorer så att tiden är lika.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync kunde inte upptäcka filsystemtyp.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSYNC fel vid intern bearbetning.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync misslyckades att reservera minne.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatal parameter fel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync processteg update misslyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync processteg reconcile misslyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync processteg propagate misslyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Målmappen finns inte</p><p>Vänligen, kontroller inställningen för sync.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>En fil på servern kan inte skapas. Kontrollera åtkomst till fjärranslutningen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Kan inte skriva till det lokala filsystemet. Var god kontrollera rättigheterna.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync misslyckades att ansluta genom en proxy.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync kunde inte autentisera mot proxy. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync misslyckades att hitta proxy eller server.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync misslyckades att autentisera mot %1 servern.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSYNC misslyckades på grund av att nekad åtkomst inte hanterades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync försökte skapa en mapp som redan finns.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Ingen plats på %1 server tillgänglig.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync ospecificerat fel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync misslyckades att ansluta mot nätverket.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Ett anslutningsfel mot nätverket uppstod.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Ett HTTP överföringsfel inträffade.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Avbruten av användare</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Internt fel nummer %1 uppstod.</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>Kan inte skapa csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Fil %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Fil %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -1392,40 +1392,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1433,39 +1420,65 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>Kunde ej ta bort mappen %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna katalog får inte byta namn. Den kommer att döpas om till sitt original namn.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1814,6 +1827,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2135,27 +2156,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2211,7 +2232,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Kontext</translation>
</message>
@@ -2237,7 +2258,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>raderad</translation>
</message>
@@ -2248,46 +2269,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>laddar ner</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>laddar upp</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>inaktiv</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>startar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>klar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>radera</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index b5b6b4f..d9e673e 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
@@ -164,12 +164,12 @@
<translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -189,32 +189,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>เสร็จสิ้น</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync ล้มเหลวในการสร้างไฟล์ล็อคข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>ปลั๊กอิน %1 สำหรับ csync could not be loadeไม่สามารถโหลดได้.<br/>กรุณาตรวจสอบความถูกต้องในการติดตั้ง!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>เวลาในระบบของโปรแกรมไคลเอนต์นี้แตกต่างจากเวลาในระบบของเซิร์ฟเวอร์ กรุณาใช้บริการผสานข้อมูลของเวลา (NTP) บนเซิร์ฟเวอร์และเครื่องไคลเอนต์เพื่อปรับเวลาให้ตรงกัน</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync ไม่สามารถตรวจพบประเภทของไฟล์ในระบบได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>การจัดสรรหน่วยความจำ CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>การปรับปรุงขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>การถ่ายทอดขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>ไม่สามารถเขียนข้อมูลไปยังไฟล์ระยะไกลได้ กรุณาตรวจสอบการเข้าถึงข้อมูลระยะไกล</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>ระบบไฟล์ในพื้นที่ไม่สามารถเขียนข้อมูลได้ กรุณาตรวจสอบสิทธิ์การเข้าใช้งาน</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync ล้มเหลวในการเชื่อมต่อผ่านทางพร็อกซี่</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>หมดเวลาการเชื่อมต่อเครือข่าย</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>เกิดข้อผิดพลาดภายในระบบหมายเลข %1</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1387,80 +1387,93 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1809,6 +1822,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2130,27 +2151,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation type="unfinished"/>
</message>
@@ -2206,7 +2227,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"/>
</message>
@@ -2232,7 +2253,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>ลบแล้ว</translation>
</message>
@@ -2243,46 +2264,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>ลบ</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index f96885b..52a4c35 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -189,32 +189,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Успішно.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync не вдалося створити файл блокування.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p> %1 плагін для синхронізації не вдалося завантажити.<br/>Будь ласка, перевірте його інсталяцію!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Системний час цього клієнта відрізняється від системного часу на сервері. Будь ласка, використовуйте сервіс синхронізації часу (NTP) на сервері та клієнті, аби час був однаковий.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync не вдалося визначити тип файлової системи.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>У CSync виникла помилка під час сканування внутрішньої структури каталогів.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не вдалося зарезервувати пам'ять.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>У CSync сталася фатальна помилка параметра.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync не вдалася зробити оновлення .</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync не вдалася зробити врегулювання.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync не вдалася зробити розповсюдження.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Не можливо проводити запис у віддалену файлову систему. Будь ласка, перевірте повноваження доступу.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Не можливо проводити запис у локальну файлову систему. Будь ласка, перевірте повноваження.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync не вдалося приєднатися через Проксі.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не вдалося знайти Проксі або Сервер.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не вдалося аутентифікуватися на %1 сервері.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync завершився неуспішно через порушення прав доступу.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync намагалася створити каталог, який вже існує.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: на сервері %1 скінчилося місце.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Невизначена помилка CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не вдалося приєднатися до мережі.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Час під'єднання до мережі вичерпався.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Сталася помилка передачі даних по HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Виникла внутрішня помилка за номером %1 .</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1387,80 +1387,93 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1809,6 +1822,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2130,27 +2151,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation type="unfinished"/>
</message>
@@ -2206,7 +2227,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"/>
</message>
@@ -2232,7 +2253,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>видалені</translation>
</message>
@@ -2243,46 +2264,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>видалити</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 8c16490..56627e0 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
@@ -164,12 +164,12 @@
<translation>正在执行同步。<br />您确定要关闭它吗？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -189,32 +189,32 @@
<translation>完整地</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 of %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>完全结束。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync 无法创建文件锁。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>csync 的 %1 插件不能加载。<br/>请校验安装！</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>本客户端的系统时间和服务器的系统时间不一致。请在服务器和客户机上使用时间同步服务 (NTP)以让时间一致。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync 无法检测文件系统类型。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 在处理内部文件树时出错。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 失败，内存不足。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 致命参数错误。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync 处理步骤更新失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 处理步骤调和失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync 处理步骤传播失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>目标目录不存在。</p><p>请检查同步设置。</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>远程文件不可写，请检查远程权限。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>本地文件系统不可写。请检查权限。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync 未能通过代理连接。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 无法查询代理或服务器。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 于 %1 服务器认证失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>出于未处理的权限拒绝，CSync 失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync 尝试创建了已有的文件夹。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：%1 服务器空间已满。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync 未定义错误。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 联网失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>Csync同步失败，请确定是否有本地同步目录的读写权</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync写日志文件失败</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>网络连接超时。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 传输错误。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>发生内部错误 %1</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation>不能生成 csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -1387,40 +1387,27 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>文件只读共享已取消，文件恢复完毕</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>一个文件已经解除只读共享，但是恢复失败: %1</translation>
- </message>
-</context>
-<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1428,39 +1415,65 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1809,6 +1822,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2130,27 +2151,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2206,7 +2227,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"/>
</message>
@@ -2232,7 +2253,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>已经删除</translation>
</message>
@@ -2243,46 +2264,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>删除</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index e947118..98e81fe 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -144,7 +144,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>無%1連線設定</translation>
</message>
@@ -164,12 +164,12 @@
<translation>正在同步中<br/>你真的想要中斷？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -189,32 +189,32 @@
<translation>完成</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4 的 %5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>完成結束。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSync 無法建立文件鎖</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>用於csync的套件%1</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>本客戶端的系統時間和伺服器系統時間不一致,請在伺服器與客戶端上使用時間同步服務(NTP)讓時間保持一致</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync 無法偵測檔案系統的類型</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 處理內部資料樹時發生錯誤</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 無法取得記憶體空間。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 參數錯誤。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync 處理步驟 "update" 失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 處理步驟 "reconcile" 失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync 處理步驟 "propagate" 失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>目標資料夾不存在</p><p>請檢查同步設定</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>遠端檔案無法寫入，請確認遠端存取權限。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>本地檔案系統無法寫入，請確認權限。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync 透過代理伺服器連線失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 查詢代理伺服器或伺服器失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 於伺服器 %1 認證失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync 失敗，由於未處理的存取被拒。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync 試圖建立一個已經存在的目錄。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：伺服器 %1 沒有可用空間。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync 未知的錯誤。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 無法連接到網路。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>網路連線逾時。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 傳輸錯誤。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>發生內部錯誤，錯誤編號 %1</translation>
</message>
@@ -437,106 +437,106 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -1387,80 +1387,93 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateItemJob</name>
+ <name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateLocalMkdir</name>
+ <name>Mirall::PropagateNeonJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
- <source>could not create directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ProtocolWidget</name>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="14"/>
@@ -1809,6 +1822,14 @@ Please ensure that your network connection is working.</source>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2130,27 +2151,27 @@ Please ensure that your network connection is working.</source>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation type="unfinished"/>
</message>
@@ -2206,7 +2227,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation type="unfinished"/>
</message>
@@ -2232,7 +2253,7 @@ Please ensure that your network connection is working.</source>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>已刪除</translation>
</message>
@@ -2243,46 +2264,46 @@ Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>刪除</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 6ecf858..1da49d5 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -144,7 +144,7 @@
<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="762"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
@@ -164,12 +164,12 @@
<translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 / %2 (%%3) kullanımda.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="748"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="754"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> ile bağlı.</translation>
</message>
@@ -189,32 +189,32 @@
<translation>Tam olarak</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="649"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="655"/>
<source>%1 %2 %3 (%4 of %5)</source>
<translation>%1 %2 %3 (%4/%5)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="652"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="658"/>
<source>Completely finished.</source>
<translation>Tamamen bitti.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="659"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<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="751"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<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="755"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
<translation>%1 bağlantısı <a href="%1">%2</a> üzerinde yok.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
@@ -230,178 +230,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="83"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>Success.</source>
<translation>Başarılı.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="86"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="92"/>
<source>CSync failed to create a lock file.</source>
<translation>CSynk arkiv kapi yampadi. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="96"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="102"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Csync için %1 eklentisi yüklenemedi.<br/>Lütfen kurulumu doğrulayın!</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="99"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="105"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
<translation>Bu istemci üzerinde sistem saati sunucudaki sistem saati ile farklıdır. Sunucu ve istemci makinelerde bir zaman eşitleme hizmeti (NTP) kullanırsanız zaman aynı kalır.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="104"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSynk sistem arama arkivden olmadi. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="107"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Hata CSynkden icerli kategoriji islemeyi</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="110"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync bellek ayıramadı.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="113"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync fatal parameter error.</source>
<translation>CSync ölümcül parametre hatası</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="116"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step update failed.</source>
<translation>CSync güncelleme süreç adımı başarısız.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="119"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync uzlaştırma süreç adımı başarısız.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="122"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="128"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync yayma süreç adımı başarısız.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="125"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="131"/>
<source><p>The target directory does not exist.</p><p>Please check the sync setup.</p></source>
<translation><p>Hedef dizin mevcut değil.</p><p>Lütfen eşitleme ayarını denetleyin.</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="135"/>
<source>A remote file can not be written. Please check the remote access.</source>
<translation>Arkiv uzcakli yazilis olmali. Lutfen gecini uzakli test edin. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="133"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Yerel dosya sistemine yazılamıyor. Lütfen izinleri kontrol edin.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="136"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSynz bir vekil sunucu aracılığıyla bağlanırken hata oluştu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="139"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync vekil sunucuda kimlik doğrulayamadı</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="142"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync bir vekil veya sunucu ararken başarısız oldu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="145"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync %1 sunucusunda kimlik doğrularken başarısız oldu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="157"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync ele alınmayan izin reddinden dolayı başarısız.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="163"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync, zaten mevcut olan bir dizin oluşturmaya çalıştı.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="166"/>
- <location filename="../src/mirall/csyncthread.cpp" line="169"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: %1 sunucusunda kullanılabilir alan yok.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="172"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync belirtilmemiş hata.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="238"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="244"/>
<source>The item is not synced because of previous errors:</source>
<translation>Önceki hata koşullarından dolayı bu öge eşitlenmedi:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="274"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="448"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="469"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="148"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ağa bağlanamadı.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="95"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
<translation>CSync, günlük dosyası yükleyemedi veya oluşturamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
<translation>CSync günlük dosyasına yazamadı.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="151"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>A network connection timeout happend.</source>
<translation>Bir ağ zaman aşımı meydana geldi.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="154"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>A HTTP transmission error happened.</source>
<translation>Bir HTTP aktarım hatası oluştu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="160"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
<source>CSync failed to access </source>
<translation>CSync erişemedi</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Kullanıcı tarafından iptal edildi</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="185"/>
<source>An internal error number %1 happend.</source>
<translation>Hata iceri numarali %</translation>
</message>
@@ -437,90 +437,90 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="103"/>
+ <location filename="../src/mirall/folder.cpp" line="99"/>
<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="163"/>
+ <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="166"/>
+ <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="169"/>
+ <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="316"/>
+ <location filename="../src/mirall/folder.cpp" line="311"/>
<source>File %1: %2</source>
<translation>Dosya %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="317"/>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>File %1</source>
<translation>Dosya %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="367"/>
<source>downloaded</source>
<translation>indirildi</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="373"/>
+ <location filename="../src/mirall/folder.cpp" line="368"/>
<source>removed</source>
<translation>kaldırıldı</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="374"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>updated</source>
<translation>güncellendi</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="372"/>
<source>renamed</source>
<translation>adlandırıldı</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="382"/>
+ <location filename="../src/mirall/folder.cpp" line="377"/>
<source>moved</source>
<translation>taşındı</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="384"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>%1 to %2</source>
<translation>%1 ile %2 arası</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="397"/>
+ <location filename="../src/mirall/folder.cpp" line="392"/>
<source>'%1' has been %2.</source>
<translation>'%1' %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>Files %1</source>
<translation>Dosya %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="395"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' ve diğer %2 dosya %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<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="709"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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>
@@ -529,17 +529,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="713"/>
+ <location filename="../src/mirall/folder.cpp" line="696"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -1393,40 +1393,27 @@ Kullanmanız önerilmez.</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateDownloadFile</name>
+ <name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="572"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
- <translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="637"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<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>
-</context>
-<context>
- <name>Mirall::PropagateItemJob</name>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="144"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Dosya salt okunur bir paylaşımdan kaldırılmıştı. Dosya geri yüklendi.</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="146"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Dosya bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
<source>could not create directory %1</source>
<translation>%1 dizini oluşturulamadı</translation>
</message>
@@ -1434,36 +1421,62 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="209"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
<source>Could not remove directory %1</source>
<translation>%1 dizini kaldırılamadı</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateNeonJob</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="912"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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/owncloudpropagator.cpp" line="914"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="261"/>
<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>
</context>
<context>
- <name>Mirall::PropagateUploadFile</name>
+ <name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="383"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="438"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Eşitleme sırasında yerel dosya değişti, tamamen ulaştıktan sonra bir kez eşitlenecek</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="386"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
<source>Sync was aborted by user.</source>
- <translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>Mirall::PropagateUploadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <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="242"/>
+ <source>No X-OC-MTime extension, ownCloud 5 is required</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1819,6 +1832,14 @@ Lütfen ağ bağlantınızın çalıştığından emin olun.</translation>
</message>
</context>
<context>
+ <name>Mirall::Theme</name>
+ <message>
+ <location filename="../src/mirall/theme.cpp" line="205"/>
+ <source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
@@ -2140,27 +2161,27 @@ Lütfen ağ bağlantınızın çalıştığından emin olun.</translation>
<context>
<name>Utility</name>
<message>
- <location filename="../src/mirall/utility.cpp" line="113"/>
+ <location filename="../src/mirall/utility.cpp" line="114"/>
<source>%L1 TB</source>
<translation>%L1 TB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="116"/>
+ <location filename="../src/mirall/utility.cpp" line="117"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="119"/>
+ <location filename="../src/mirall/utility.cpp" line="120"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="122"/>
+ <location filename="../src/mirall/utility.cpp" line="123"/>
<source>%L1 kB</source>
<translation>%L1 kB</translation>
</message>
<message>
- <location filename="../src/mirall/utility.cpp" line="125"/>
+ <location filename="../src/mirall/utility.cpp" line="126"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
@@ -2216,7 +2237,7 @@ Lütfen ağ bağlantınızın çalıştığından emin olun.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="86"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
<source>Context</source>
<translation>Bağlam</translation>
</message>
@@ -2242,7 +2263,7 @@ Lütfen ağ bağlantınızın çalıştığından emin olun.</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="113"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
<source>deleted</source>
<translation>silindi</translation>
</message>
@@ -2253,46 +2274,46 @@ Lütfen ağ bağlantınızın çalıştığından emin olun.</translation>
<translation>%1 konumuna taşındı</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="92"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="98"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
<source>downloading</source>
<translation>indiriliyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="83"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="95"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="101"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
<source>uploading</source>
<translation>yükleniyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="89"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
<source>inactive</source>
<translation>etkin değ</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="104"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
<source>starting</source>
<translation>başlatılıyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="107"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
<source>finished</source>
<translation>tamamlandı</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="110"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
<source>delete</source>
<translation>sil</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
<source>move</source>
<translation>taşı</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
<source>moved</source>
<translation>taşındı</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