[Pkg-owncloud-commits] [owncloud-client] 04/47: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Feb 17 18:06:32 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 25ee44dd69fb7dc627b4a3b3d00d5a15865bf7e2
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Wed Feb 5 01:57:23 2014 -0500
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 208 +++++++++++++++++----------------
translations/mirall_cs.ts | 119 ++++++++++---------
translations/mirall_de.ts | 121 +++++++++++---------
translations/mirall_el.ts | 119 ++++++++++---------
translations/mirall_en.ts | 119 ++++++++++---------
translations/mirall_es.ts | 121 +++++++++++---------
translations/mirall_es_AR.ts | 119 ++++++++++---------
translations/mirall_et.ts | 119 ++++++++++---------
translations/mirall_eu.ts | 119 ++++++++++---------
translations/mirall_fa.ts | 119 ++++++++++---------
translations/mirall_fi.ts | 119 ++++++++++---------
translations/mirall_fr.ts | 119 ++++++++++---------
translations/mirall_gl.ts | 121 +++++++++++---------
translations/mirall_hu.ts | 119 ++++++++++---------
translations/mirall_it.ts | 127 +++++++++++---------
translations/mirall_ja.ts | 267 +++++++++++++++++++++++--------------------
translations/mirall_nl.ts | 119 ++++++++++---------
translations/mirall_pl.ts | 119 ++++++++++---------
translations/mirall_pt.ts | 119 ++++++++++---------
translations/mirall_pt_BR.ts | 121 +++++++++++---------
translations/mirall_ru.ts | 119 ++++++++++---------
translations/mirall_sk.ts | 119 ++++++++++---------
translations/mirall_sl.ts | 119 ++++++++++---------
translations/mirall_sv.ts | 119 ++++++++++---------
translations/mirall_th.ts | 119 ++++++++++---------
translations/mirall_uk.ts | 119 ++++++++++---------
translations/mirall_zh_CN.ts | 119 ++++++++++---------
translations/mirall_zh_TW.ts | 119 ++++++++++---------
translations/pofiles/tr.po | 121 +++++++++++---------
29 files changed, 2042 insertions(+), 1664 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index c233850..94f5252 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -80,7 +80,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="20"/>
<source>Account to Synchronize</source>
- <translation type="unfinished"/>
+ <translation>Compte a sincronitzar</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="41"/>
@@ -156,7 +156,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="102"/>
<source>No account configured.</source>
- <translation type="unfinished"/>
+ <translation>No hi ha cap compte configurat</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="428"/>
@@ -166,7 +166,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="716"/>
<source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
+ <translation>%1 de %2 (%3%) en ús.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="748"/>
@@ -206,12 +206,12 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="751"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
- <translation type="unfinished"/>
+ <translation>Connectat a <a href="%1">%2</a> com a <i>%3</i>.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="755"/>
<source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
+ <translation>Sense connexió amb %1 a <a href="%1">%2</a>.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="720"/>
@@ -222,9 +222,9 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
- <translation type="unfinished"/>
+ <translation>La connexió ha fallat</translation>
</message>
</context>
<context>
@@ -240,168 +240,168 @@
<translation>CSync ha fallat en crear un fitxer de bloqueig.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync ha fallat en carregar la db d'estat.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync ha falat en escriure l'estat de la db.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<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="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de paràmetre en CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Error inespecífic de CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>La sincronització d'enllaços simbòlics no està implementada.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
+ <translation>El fitxer està a la llista d'ignorats.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation type="unfinished"/>
+ <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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
+ <translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
- <translation type="unfinished"/>
+ <translation>CSync ha fallat en accedir</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Aturat per l'usuari</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>S'ha produït l'error intern número %1</translation>
</message>
@@ -411,7 +411,7 @@
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
<source>No ownCloud account configured</source>
- <translation type="unfinished"/>
+ <translation>No hi ha cap compte ownCloud configurat</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
@@ -470,47 +470,47 @@
<message>
<location filename="../src/mirall/folder.cpp" line="372"/>
<source>downloaded</source>
- <translation type="unfinished"/>
+ <translation>baixat</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="373"/>
<source>removed</source>
- <translation type="unfinished"/>
+ <translation>eliminat</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="374"/>
<source>updated</source>
- <translation type="unfinished"/>
+ <translation>actualitzat</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="377"/>
<source>renamed</source>
- <translation type="unfinished"/>
+ <translation>reanomena</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="382"/>
<source>moved</source>
- <translation type="unfinished"/>
+ <translation>mogut</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="384"/>
<source>%1 to %2</source>
- <translation type="unfinished"/>
+ <translation>%1 a %2</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' has been %2.</source>
- <translation type="unfinished"/>
+ <translation>'%1' ha estat %2.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="399"/>
<source>Files %1</source>
- <translation type="unfinished"/>
+ <translation>Fitxers %1</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="400"/>
<source>'%1' and %2 other files have been %3.</source>
- <translation type="unfinished"/>
+ <translation>'%1' i %2 altres fitxers s'han %3.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="452"/>
@@ -762,7 +762,7 @@ Esteu segur que voleu executar aquesta operació?</translation>
<location filename="../src/mirall/folderwizard.cpp" line="43"/>
<location filename="../src/mirall/folderwizard.cpp" line="45"/>
<source><b>Warning:</b> </source>
- <translation type="unfinished"/>
+ <translation><b>Avís:</b> </translation>
</message>
</context>
<context>
@@ -775,7 +775,7 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
<source>General Setttings</source>
- <translation type="unfinished"/>
+ <translation>Arranjament general</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -814,12 +814,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="258"/>
<source>Enter Password</source>
- <translation type="unfinished"/>
+ <translation>Escriviu contrasenya</translation>
</message>
<message>
<location filename="../src/creds/httpcredentials.cpp" line="259"/>
<source>Please enter %1 password for user '%2':</source>
- <translation type="unfinished"/>
+ <translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
</message>
</context>
<context>
@@ -1225,7 +1225,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="224"/>
<source>Connection failed</source>
- <translation type="unfinished"/>
+ <translation>La connexió ha fallat</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="261"/>
@@ -1295,12 +1295,12 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="172"/>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="180"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
- <translation type="unfinished"/>
+ <translation>Ha fallat la connexió amb %1 a %2:<br/>%3</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="263"/>
<source>No remote folder specified!</source>
- <translation type="unfinished"/>
+ <translation>No heu especificat cap carpeta remota!</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="269"/>
@@ -1399,25 +1399,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
- <translation type="unfinished"/>
+ <translation>L'usuari ha aturat la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1425,7 +1438,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>No s'ha pogut esborrar la carpeta %1</translation>
</message>
@@ -1433,12 +1446,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1446,15 +1459,15 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
+ <translation>El fitxer local ha canviat durant la sincronització, es sincronitzarà quan arribi complet</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
- <translation type="unfinished"/>
+ <translation>L'usuari ha aturat la sincronització.</translation>
</message>
</context>
<context>
@@ -1467,7 +1480,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="20"/>
<source>Sync Activity</source>
- <translation type="unfinished"/>
+ <translation>Activitat de sincronització</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1527,7 +1540,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="143"/>
<source>The sync status has been copied to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>L'estat de sincronització s'ha copiat al porta-retalls.</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="215"/>
@@ -1584,23 +1597,24 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
<source>%1 - Authenticate</source>
- <translation type="unfinished"/>
+ <translation>%1 - Autenticat</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
<source>%1 - %2</source>
- <translation type="unfinished"/>
+ <translation>%1 - %2</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
<source>Error loading IdP login page</source>
- <translation type="unfinished"/>
+ <translation>Error en carregar la pàgina d'acreditació IdP</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
- <translation type="unfinished"/>
+ <translation>No s'ha pogut carregar la pàgina d'acreditació per acreditar-vos.
+Assegureu-vos que la connexió a la xarxa funciona.</translation>
</message>
</context>
<context>
@@ -1802,7 +1816,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
<source>%1: %2</source>
- <translation type="unfinished"/>
+ <translation>%1: %2</translation>
</message>
</context>
<context>
@@ -1810,7 +1824,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="171"/>
<source>Please sign in</source>
- <translation type="unfinished"/>
+ <translation>Acrediteu-vos</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="203"/>
@@ -1885,12 +1899,12 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="361"/>
<source>Sign in...</source>
- <translation type="unfinished"/>
+ <translation>Acredita...</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="363"/>
<source>Sign out</source>
- <translation type="unfinished"/>
+ <translation>Surt</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="373"/>
@@ -2276,12 +2290,12 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="116"/>
<source>move</source>
- <translation type="unfinished"/>
+ <translation>mou</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="119"/>
<source>moved</source>
- <translation type="unfinished"/>
+ <translation>mogut</translation>
</message>
</context>
<context>
@@ -2314,7 +2328,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
<source>Sync Error</source>
- <translation type="unfinished"/>
+ <translation>Error de sincronització</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="66"/>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index b9352b2..2a0b80c 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Spojení selhalo</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSync nemůže vytvořit zámek.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync nemůže načíst databázi stavu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync selhal při zápisu do databáze stavu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync se nezdařilo rezervovat paměť.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync: kritická chyba parametrů.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Nespecifikovaná chyba CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Nastala chyba HTTP přenosu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync se nezdařil přístup</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Zrušeno uživatelem</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Nastala vnitřní chyba číslo %1.</translation>
</message>
@@ -1401,25 +1401,38 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/brány</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -1427,7 +1440,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Nepodařilo se odstranit adresář %1</translation>
</message>
@@ -1435,12 +1448,12 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1448,13 +1461,13 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 0da1790..0fc1962 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Fern-Zielordner auswählen</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -223,7 +223,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Verbindung fehlgeschlagen</translation>
</message>
@@ -241,168 +241,168 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>CSync konnte keine lock-Datei erstellen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync konnte die state db nicht laden.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync konnte die state db nicht schreiben.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync konnte keinen Speicher reservieren.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync Verarbeitungsschritt "Übertragung" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync unbekannter Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync-Zugriff fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Abbruch durch den Benutzer</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Interne Fehlernummer %1 aufgetreten.</translation>
</message>
@@ -1402,25 +1402,38 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
@@ -1428,7 +1441,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Verzeichnis %1 konnte nicht entfernt werden</translation>
</message>
@@ -1436,12 +1449,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1449,13 +1462,13 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert, synchronisieren Sie nochmals sobald die aktuelle Datei vollständig angekommen ist</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index c39af4a..f31e996 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Σύνδεση απέτυχε</translation>
</message>
@@ -240,168 +240,168 @@
<translation>Το CSync απέτυχε να δημιουργήσει ένα αρχείο κλειδώματος.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync απέτυχε να φορτώσει την βάση δεδομένων κατάστασης.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync απέτυχε να εγγράψει τη βάση δεδομένων κατάστασης.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation>To CSync δεν μπορούσε να ανιχνεύσει τον τύπο του αρχείου συστήματος.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>Το CSync απέτυχε να διατηρήσει τη μνήμη.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync μοιραίο σφαλμα παράμετρου.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync ενημέρωση στάδιο επεξεργασίας απέτυχε. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>Η προώθηση του CSync απέτυχε.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Το τοπικό σύστημα αρχείων δεν μπορεί να εγγράψει. Παρακαλούμε ελέγξτε τα δικαιώματα.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation>Το CSync απέτυχε να συνδεθεί μέσω ενός proxy. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync αδυναμία ελέγχου ταυτότητας στο διακομιστή μεσολάβησης.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync απέτυχε να lookup μεσολάβησης ή διακομιστή. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync απέτυχε τον έλεγχο ταυτότητας στο 1% διακομιστή. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync απέτυχε λόγω μη γίνεται deniend άδεια. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>Το CSync προσπαθησε να δημιουργησει εναν χωρο αποθηκευσης που υπηρχε ηδη.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Δεν υπαρχει διαθεσιμος χωρος στον %1 διακομιστη.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync αγνωστο σφαλμα.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation>Αυτό το αντικείμενο δεν θα συγχρονιστεί λόγω προηγούμενων σφαλμάτων:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Συνέβη ένα χρονικό όριο σύνδεσης δικτύου. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Ένα εσωτερικό σφάλμα με αριθμό %1 συνέβη.</translation>
</message>
@@ -1399,25 +1399,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>αδυναμία δημιουργίας καταλόγου %1</translation>
</message>
@@ -1425,7 +1438,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Αδυναμία αφαίρεσης καταλόγου %1</translation>
</message>
@@ -1433,12 +1446,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε το ξανά Κοινόχρηστος.</translation>
</message>
@@ -1446,13 +1459,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού, θα συγχρονιστεί και πάλι όταν φτάσει πλήρως</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 76cc958..803f44b 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -224,7 +224,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"></translation>
</message>
@@ -242,168 +242,168 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation type="unfinished"></translation>
</message>
@@ -1396,25 +1396,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
+ <source>The file was removed from a read only share. The file has been restored.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
+ <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1422,7 +1435,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1430,12 +1443,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
@@ -1443,13 +1456,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 220bba9..6d438b4 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Seleccionar una carpeta remota de destino</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>La conexión falló</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSync no pudo crear un fichero de bloqueo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync no pudo cargar la base de datos de estado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync falló al escribir el estado en la base de datos.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>Fallo al reservar memoria para Csync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>Error al acceder CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Ha ocurrido un error interno con número %1.</translation>
</message>
@@ -1401,25 +1401,38 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>La sincronización ha sido Interrumpida por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>No se pudo crear el directorio %1</translation>
</message>
@@ -1427,7 +1440,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>No se pudo eliminar el directorio %1</translation>
</message>
@@ -1435,12 +1448,12 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1448,13 +1461,13 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>La sincronización ha sido Interrumpida por el usuario</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 8f1cf26..f7f603b 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Fallo de Conexión</translation>
</message>
@@ -240,168 +240,168 @@
<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="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync no pudo cargar la base de datos de estados.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>Falló CSync en escribir la base de datos de estados.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falló al reservar memoria.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync falló al acceder</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Error: ocurrió un error del tipo %1.</translation>
</message>
@@ -1399,25 +1399,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizaciójn abortada por el usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1425,7 +1438,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1433,12 +1446,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1446,13 +1459,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizaciójn abortada por el usuario.</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 181a003..9e90ca2 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Ühendus ebaõnnestus</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSync lukustusfaili loomine ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync staatuse andmabaasi laadimine ebaõnnestus.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync saatuse kirjutamine andmebaasi ebaõnnestus.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei suutnud mälu reserveerida.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parameetri saatuslik viga.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync uuendusprotsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync tasakaalustuse protsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync edasikandeprotsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync tuvastamatu viga.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Toimus võrgukatkestus.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP ülekande viga.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSyncile ligipääs ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Kasutaja poolt tühistatud</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Tekkis sisemine viga number %1.</translation>
</message>
@@ -1401,25 +1401,38 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>ei suuda luua kataloogi %1</translation>
</message>
@@ -1427,7 +1440,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Kausta %1 ei saa eemaldada</translation>
</message>
@@ -1435,12 +1448,12 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1448,13 +1461,13 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 879fc4d..a49d822 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Konexioak huts egin du</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSyncek huts egin du lock fitxategia sortzean.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSyncek huts egin du egoera db kargatzean.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncek huts egin du memoria alokatzean.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parametro larri errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSyncen zehaztugabeko errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Sarearen konexioan denbora-muga gertatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP transmisio errore bat gertatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Erabiltzaileak bertan behera utzita</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Barne errore bat gertatu da, zenbakia %1.</translation>
</message>
@@ -1394,25 +1394,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1428,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1441,13 +1454,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 2410db3..2d2aa3e 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -240,168 +240,168 @@
<translation>CSync موفق به ایجاد یک فایل قفل شده، نشد.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync موفق به بارگذاری حالت دیتابیس، نشد.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync نوع فایل های سیستم را نتوانست تشخیص بدهد.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync موفق به رزرو حافظه نشد است.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>مرحله گسترش پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>بر روی فایل سیستمی محلی نمی توانید چیزی بنویسید.لطفا مجوزش را بررسی کنید.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation>عدم موفقیت CSync برای اتصال از طریق یک پروکسی.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>عدم موفقیت CSync برای مراجعه به پروکسی یا سرور.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>عدم موفقیت CSync برای اعتبار دادن در %1 سرور.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>خطای نامشخص CSync </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation>عدم موفقیت CSync برای اتصال به شبکه.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>اتصال به یک شبکه متوقف شده است.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>خطا در انتقال HTTP اتفاق افتاده است.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>یک خطای داخلی به شماره ی %1 اتفاق افتاد.</translation>
</message>
@@ -1394,25 +1394,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1428,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1441,13 +1454,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index dc23f39..5dfa9e9 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Yhteys epäonnistui</translation>
</message>
@@ -240,168 +240,168 @@
<translation>Csync ei onnistunut luomaan lukitustiedostoa.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>Csync ei onnistunut lataamaan tilatietokantaa.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei onnistunut varaamaan muistia.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync - määrittämätön virhe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Verkon aikakatkaisuvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Tapahtui HTTP-välitysvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Tapahtui sisäinen virhe %1.</translation>
</message>
@@ -1395,25 +1395,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1421,7 +1434,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Kansion %1 poistaminen epäonnistui</translation>
</message>
@@ -1429,12 +1442,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1442,13 +1455,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 6a20de1..af0c3f7 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Échec de la connexion</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSync n'a pas pu créer le fichier de verrouillage.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync n'a pas pu charger l'état de la base de données.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>L'enregistrement par CSync de l'état de la base de données a échoué.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<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="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Erreur fatale CSync : mauvais paramètre.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Erreur CSync inconnue.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>Echec de CSync pour accéder</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Abandonné par l'utilisateur</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Une erreur interne numéro %1 est survenue.</translation>
</message>
@@ -1401,25 +1401,38 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>La synchronisation a été interrompue par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>impossible de créer le répertoire %1</translation>
</message>
@@ -1427,7 +1440,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Impossible de supprimer le dossier %1</translation>
</message>
@@ -1435,12 +1448,12 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1448,13 +1461,13 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Fichier local modifié pendant la synchronisation, la synchronisation redémarrera lorsque ce sera terminé</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>La synchronisation a été interrompue par l'utilisateur.</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 197063a..08ff0e3 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Seleccione o cartafol remoto de destino</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Produciuse un fallo de conexión</translation>
</message>
@@ -240,168 +240,168 @@
<translation>Produciuse un fallo en CSync ao crear un ficheiro de bloqueo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>Produciuse un fallo en CSync ao cargar o estado da BD.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>Produciuse un fallo en CSync ao escribir o estado da BD</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<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="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<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="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Produciuse un erro non especificado de CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>Produciuse un fallo ao acceder a CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Interrompido polo usuario</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Produciuse un erro interno número %1. </translation>
</message>
@@ -1401,25 +1401,38 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>A sincronización foi interrompida polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>non foi posíbel crear o directorio %1</translation>
</message>
@@ -1427,7 +1440,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Non foi posíbel retirar o directorio %1</translation>
</message>
@@ -1435,12 +1448,12 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1448,13 +1461,13 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>O ficheiro local cambiou durante a sincronización, sincronizando unha vez quedou completado</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>A sincronización foi interrompida polo usuario.</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index c0f6e6e..0028d32 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -240,168 +240,168 @@
<translation>A CSync nem tudott létrehozni lock fájlt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>A CSync nem tudta betölteni a státus adatbázist.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>Hiba a CSync memórifoglalásakor.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hibás paraméterhiba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync ismeretlen hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP átviteli hiba történt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Belső hiba történt, száma: %1.</translation>
</message>
@@ -1394,25 +1394,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1428,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1441,13 +1454,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index a5674cd..5ee9e51 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Seleziona una cartella remota di destinazione </translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Connessione non riuscita</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSync non è riuscito a creare il file di lock.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync non è riuscito a caricare lo state db.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync non è riuscito a scrivere lo state db.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<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="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Errore grave di parametro di CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Errore non specificato di CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync non è riuscito ad accedere</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Interrotto dall'utente</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>SI è verificato un errore interno numero %1</translation>
</message>
@@ -1090,7 +1090,7 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<location filename="../src/updater/ocupdater.cpp" line="56"/>
<source>A new update is about to be installed. The updater may ask
for additional privileges during the process.</source>
- <translation>Un nuovo aggiornamento sta per essere installato. L'aggiornamento potrebbe richiedere privilegi di amministratore durante il processo.</translation>
+ <translation>Un nuovo aggiornamento sta per essere installato. L'aggiornamento potrebbe richiedere privilegi di amministratore durante l'avanzamento.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="77"/>
@@ -1105,12 +1105,12 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="81"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
- <translation>Impossibile scaricare l'aggiornamento. Per favore clicca <a href='%1'>qui</a> per scaricare l'aggiornamento manualmente.</translation>
+ <translation>Impossibile scaricare l'aggiornamento. Fai clic <a href='%1'>qui</a> per scaricare l'aggiornamento manualmente.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="83"/>
<source>Could not check for new updates.</source>
- <translation>Non è possibile verificare la presenza di nuovi aggiornamenti.</translation>
+ <translation>Impossibile verificare la presenza di nuovi aggiornamenti.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
@@ -1400,25 +1400,38 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun E-Tag ricevuto dal server, controlla il Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -1426,7 +1439,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Impossibile rimuovere la cartella %1</translation>
</message>
@@ -1434,12 +1447,12 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1447,13 +1460,13 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Un file locale è cambiato durante la sincronizzazione, riprova più tardi.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 045b522..3fac412 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -9,7 +9,7 @@
<message>
<location filename="../src/mirall/folderwizardsourcepage.ui" line="33"/>
<source>Pick a local folder on your computer to sync</source>
- <translation>同期するコンピュータのローカルフォルダを選択してください</translation>
+ <translation>同期するコンピュータのローカルフォルダーを選択してください</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardsourcepage.ui" line="44"/>
@@ -32,12 +32,12 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>リモートの指定先フォルダーを選択</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
<source>Add Folder</source>
- <translation>フォルダを追加</translation>
+ <translation>フォルダーを追加</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="160"/>
@@ -47,7 +47,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="174"/>
<source>Folders</source>
- <translation>フォルダ</translation>
+ <translation>フォルダー</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="107"/>
@@ -101,7 +101,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="55"/>
<source>Add Folder...</source>
- <translation>フォルダを追加…</translation>
+ <translation>フォルダーを追加…</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="94"/>
@@ -116,7 +116,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="123"/>
<source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation><b>注:</b> 外部ネットワークストレージ、共有フォルダを含んだフォルダーの場合は、上限値は違うかもしれません。</translation>
+ <translation><b>注:</b> 外部ネットワークストレージ、共有フォルダーを含んだフォルダーの場合は、上限値は違うかもしれません。</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="134"/>
@@ -126,7 +126,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="286"/>
<source>Confirm Folder Remove</source>
- <translation>フォルダの削除を確認</translation>
+ <translation>フォルダーの削除を確認</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="287"/>
@@ -136,12 +136,12 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="323"/>
<source>Confirm Folder Reset</source>
- <translation>フォルダのリセットを確認</translation>
+ <translation>フォルダーのリセットを確認</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="324"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
- <translation><p>本当にフォルダ <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
+ <translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="762"/>
@@ -161,7 +161,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="428"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
- <translation>同期操作が実行中です。<br/>終了してもよろしいですか？</translation>
+ <translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="716"/>
@@ -216,13 +216,13 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>Currently there is no storage usage information available.</source>
- <translation>現在、利用できるストレージ使用情報はありません。</translation>
+ <translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
</context>
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>接続に失敗</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSyncがロックファイルの作成に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSyncは状態DBの読み込みに失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSyncはstate dbに書き込めませんでした。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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>
+ <translation><p>csync 用の %1 プラグインをロードできませんでした。<br/>インストール状態を確認してください！</p></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSyncはファイルシステムタイプを検出できませんでした。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncで使用するメモリの確保に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSyncの致命的なパラメータエラーです。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSyncの処理ステップの更新に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSyncの処理ステップの調停に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>CSyncの処理ステップの伝播に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>ローカルファイルシステムは書き込みができません。パーミッションをチェックしてください。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSyncがプロキシー経由での接続に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSyncはそのプロキシーで認証できませんでした。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSyncはプロキシーもしくはサーバーの参照に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSyncは %1 サーバーでの認証に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSyncはすでに存在するディレクトリを作成しようとしました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
- <translation>CSync: %1 サーバーには利用可能な空きがありません。</translation>
+ <translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSyncの未指定のエラーです。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
- <translation>以前のエラーが発生した為、対象アイテムを同期していません：</translation>
+ <translation>前にエラーが発生したため、対象アイテムは同期されていません:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation>シンク機能にシンボリックリンクの提供をしていません。</translation>
+ <translation>同期の際にシンボリックリンクはサポートしていません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation>対象ファイルは無視した一覧に登録しています</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation>CSyncはネットワークへの接続に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>ネットワーク接続のタイムアウトが発生しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTPの伝送エラーが発生しました。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync はアクセスに失敗しました</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>ユーザーによって中止されました</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>内部エラー番号 %1 が発生しました。</translation>
</message>
@@ -444,7 +444,7 @@
<message>
<location filename="../src/mirall/folder.cpp" line="163"/>
<source>Local folder %1 does not exist.</source>
- <translation>ローカルフォルダ %1 は存在しません。</translation>
+ <translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="166"/>
@@ -521,7 +521,7 @@
<location filename="../src/mirall/folder.cpp" line="711"/>
<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>この同期により、ローカルの同期フォルダー '%1'にある全ファイルが削除されます。
あなた、またはあなたの管理者がサーバー上のあなたのアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation>
</message>
<message>
@@ -529,8 +529,8 @@ If you or your administrator have reset your account on the server, choose "
<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>この同期により、ローカルの同期フォルダ '%1'にある全ファイルが削除されます。
-これはフォルダが黙って再構成されたか、すべてのファイルが手動で削除されたことが原因である場合があります。
+ <translation>この同期により、ローカルの同期フォルダー '%1'にある全ファイルが削除されます。
+これはフォルダーが黙って再構成されたか、すべてのファイルが手動で削除されたことが原因である場合があります。
本当にこの操作を実行しますか？</translation>
</message>
<message>
@@ -642,7 +642,7 @@ Are you sure you want to perform this operation?</source>
<location filename="../src/mirall/folderwizard.cpp" line="442"/>
<location filename="../src/mirall/folderwizard.cpp" line="444"/>
<source>Add Folder</source>
- <translation>フォルダを追加</translation>
+ <translation>フォルダーを追加</translation>
</message>
</context>
<context>
@@ -650,12 +650,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="61"/>
<source>Click to select a local folder to sync.</source>
- <translation>同期したいローカルフォルダをクリックしてください。</translation>
+ <translation>同期したいローカルフォルダーをクリックしてください。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="65"/>
<source>Enter the path to the local folder.</source>
- <translation>ローカルフォルダのパスを入力してください。</translation>
+ <translation>ローカルフォルダーのパスを入力してください。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="69"/>
@@ -665,37 +665,37 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="98"/>
<source>No valid local folder selected!</source>
- <translation>有効なローカルフォルダが選択されていません！</translation>
+ <translation>有効なローカルフォルダーが選択されていません！</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="103"/>
<source>You have no permission to write to the selected folder!</source>
- <translation>選択されたフォルダに書き込み権限がありません</translation>
+ <translation>選択されたフォルダーに書き込み権限がありません</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="127"/>
<source>The local path %1 is already an upload folder. Please pick another one!</source>
- <translation>ローカルパス %1 はアップロードフォルダーとなっている為、他のフォルダーを選択する</translation>
+ <translation>ローカルパス %1 はアップロードフォルダーです。他のフォルダーを選択してください。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="132"/>
<source>An already configured folder is contained in the current entry.</source>
- <translation>すでに設定済みのフォルダは現在のエントリー内に含まれています。</translation>
+ <translation>すでに設定済みのフォルダーは現在のエントリー内に含まれています。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source>
- <translation>選択したフォルダは、シンボリックリンクです。そのリンクの参照先のフォルダには、既に登録されているフォルダがあります。</translation>
+ <translation>選択したフォルダーはシンボリックリンクです。そのリンクの参照先のフォルダーには、既に登録されているフォルダーがあります。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
<source>An already configured folder contains the currently entered folder.</source>
- <translation>すでに設定済みのフォルダは、現在入力されたフォルダーを含んでいます。</translation>
+ <translation>すでに設定済みのフォルダーには、現在入力されたフォルダーが含まれています。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="152"/>
<source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source>
- <translation>このフォルダは、シンボリックリンクです。このリンクが指している参照元フォルダを含んだ親フォルダが既に登録されています。</translation>
+ <translation>このフォルダーはシンボリックリンクです。このリンクが指している参照元フォルダーを含んだ親フォルダが既に登録されています。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="165"/>
@@ -710,7 +710,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="209"/>
<source>Select the source folder</source>
- <translation>ソースフォルダを選択</translation>
+ <translation>ソースフォルダーを選択</translation>
</message>
</context>
<context>
@@ -718,12 +718,12 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="251"/>
<source>Add Remote Folder</source>
- <translation>リモートフォルダを追加</translation>
+ <translation>リモートフォルダーを追加</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="252"/>
<source>Enter the name of the new folder:</source>
- <translation>新しいフォルダの名前を入力:</translation>
+ <translation>新しいフォルダー名を入力:</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="274"/>
@@ -733,7 +733,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="282"/>
<source>Failed to create the folder on %1. Please check manually.</source>
- <translation>%1 にフォルダを作成できませんでした。手作業で確認してください。</translation>
+ <translation>%1 にフォルダーを作成できませんでした。手作業で確認してください。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="331"/>
@@ -743,7 +743,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="386"/>
<source>This folder is already being synced.</source>
- <translation>このフォルダはすでに同期されています。</translation>
+ <translation>このフォルダーはすでに同期されています。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="388"/>
@@ -1139,7 +1139,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="49"/>
<source>Setup local folder options</source>
- <translation>ローカルフォルダのオプションを設定</translation>
+ <translation>ローカルフォルダーのオプションを設定</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="58"/>
@@ -1149,17 +1149,17 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="108"/>
<source>Your entire account will be synced to the local folder '%1'.</source>
- <translation>すべてのアカウントはローカルフォルダ '%1' と同期されます。</translation>
+ <translation>すべてのアカウントはローカルフォルダー '%1' と同期されます。</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="111"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
- <translation>%1 フォルダ '%2' はローカルフォルダ '%3' と同期しています</translation>
+ <translation>%1 フォルダー '%2' はローカルフォルダー '%3' と同期しています</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="117"/>
<source><p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p></source>
- <translation><p><small><strong>警告:</strong> 現在、複数のフォルダを設定しています。現在の設定で続けた場合、フォルダの設定は無視され、単一のルートフォルダの同期が生成されます！</small></p></translation>
+ <translation><p><small><strong>警告:</strong> 現在、複数のフォルダーを設定しています。現在の設定で続けた場合、フォルダー設定は無視され、単一のルートフォルダーの同期が生成されます！</small></p></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
@@ -1169,7 +1169,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
<source>Local Sync Folder</source>
- <translation>ローカル同期フォルダ</translation>
+ <translation>ローカル同期フォルダー</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="248"/>
@@ -1211,7 +1211,7 @@ for additional privileges during the process.</source>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="105"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
- <translation>このURLは暗号化されていない為、安全ではありません。ご利用はお勧めしません。</translation>
+ <translation>このURLは暗号化されていないため安全ではありません。利用はお勧めしません。</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="109"/>
@@ -1239,18 +1239,18 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Folder rename failed</source>
- <translation>フォルダー名変更に失敗しました。</translation>
+ <translation>フォルダー名の変更に失敗しました。</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="357"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program.Please close the folder or file and hit retry or cancel the setup.</source>
- <translation>このフォルダ内のフォルダまたはファイルが他のプログラムで開かれているため、このフォルダーを削除し、バックアップすることができません。フォルダまたはファイルを閉じて再試行するか、このセットアップをキャンセルしてください。</translation>
+ <translation>中にあるフォルダーまたはファイルが他のプログラムで開かれているため、フォルダーを削除したりバックアップすることができません。フォルダーまたはファイルを閉じて再試行するか、このセットアップをキャンセルしてください。</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="411"/>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="420"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
- <translation><font color="green"><b>ローカルの同期フォルダ %1 は正常に作成されました！</b></font></translation>
+ <translation><font color="green"><b>ローカルの同期フォルダー %1 は正常に作成されました！</b></font></translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="191"/>
@@ -1270,12 +1270,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="228"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
- <translation>ローカルの同期フォルダ %1 はすでに存在しています、同期のために設定してください。<br/><br/></translation>
+ <translation>ローカルの同期フォルダー %1 はすでに存在するため、同期の設定をしてください。<br/><br/></translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="230"/>
<source>Creating local sync folder %1... </source>
- <translation>ローカルの同期フォルダ %1 を作成中... </translation>
+ <translation>ローカルの同期フォルダー %1 を作成中... </translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
@@ -1290,7 +1290,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
<source>Could not create local folder %1</source>
- <translation>ローカルフォルダ %1 を作成できませんでした</translation>
+ <translation>ローカルフォルダー %1 を作成できませんでした</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="172"/>
@@ -1301,7 +1301,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="263"/>
<source>No remote folder specified!</source>
- <translation>リモートフォルダが指定されていません！</translation>
+ <translation>リモートフォルダーが指定されていません！</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="269"/>
@@ -1311,39 +1311,39 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>creating folder on ownCloud: %1</source>
- <translation>ownCloud上にフォルダを作成中: %1</translation>
+ <translation>ownCloud上にフォルダーを作成中: %1</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="298"/>
<source>Remote folder %1 created successfully.</source>
- <translation>リモートフォルダ %1 は正常に生成されました。</translation>
+ <translation>リモートフォルダー %1 は正常に生成されました。</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="300"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
- <translation>リモートフォルダ %1 は既に存在します。同期のために接続しています。</translation>
+ <translation>リモートフォルダー %1 は既に存在します。同期のために接続しています。</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
<source>The folder creation resulted in HTTP error code %1</source>
- <translation>フォルダの作成はHTTPのエラーコード %1 で終了しました</translation>
+ <translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
- <translation>資格情報が間違っていたため、リモートフォルダの作成に失敗しました！<br/>前に戻って資格情報を確認してください。</p></translation>
+ <translation>資格情報が間違っていたため、リモートフォルダーの作成に失敗しました！<br/>前に戻って資格情報を確認してください。</p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="309"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
- <translation><p><font color="red">おそらく資格情報が間違っているため、リモートフォルダの作成に失敗しました。</font><br/>前に戻り、資格情報をチェックしてください。</p></translation>
+ <translation><p><font color="red">おそらく資格情報が間違っているため、リモートフォルダーの作成に失敗しました。</font><br/>前に戻り、資格情報をチェックしてください。</p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="314"/>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
- <translation>リモートフォルダ %1 の作成がエラーで失敗しました。<tt>%2</tt>.</translation>
+ <translation>リモートフォルダー %1 の作成がエラーで失敗しました。<tt>%2</tt>.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="331"/>
@@ -1379,7 +1379,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="42"/>
<source>Open Local Folder</source>
- <translation>ローカルフォルダを開く</translation>
+ <translation>ローカルフォルダーを開く</translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="38"/>
@@ -1389,36 +1389,49 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="77"/>
<source>Your entire account is synced to the local folder <i>%1</i></source>
- <translation>すべてのアカウントはローカルフォルダ <i>%1</i> と同期されます</translation>
+ <translation>すべてのアカウントはローカルフォルダー <i>%1</i> と同期されます</translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="80"/>
<source>%1 folder <i>%1</i> is synced to local folder <i>%2</i></source>
- <translation>%1 フォルダ<i>%1</i> はローカルフォルダ <i>%2</i> と同期しています</translation>
+ <translation>%1 フォルダー <i>%1</i> はローカルフォルダー <i>%2</i> と同期しています</translation>
</message>
</context>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシー/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>ディレクトリ %1 を作成できませんでした</translation>
</message>
@@ -1426,7 +1439,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>ディレクトリ %1 を削除できません</translation>
</message>
@@ -1434,26 +1447,26 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
- <translation>このフォルダの名前の変更はできません。変更したとしても、元の名前に戻ります。</translation>
+ <translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
- <translation>このフォルダの名前の変更はできません。名前を Shared に戻してください。</translation>
+ <translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
</context>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>シンク中にローカルファイルの変更がありました。読込済みにシンクする</translation>
+ <translation>同期中にローカルファイルが変更されました。完了してからもう一度同期してください。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
@@ -1493,7 +1506,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Folder</source>
- <translation>フォルダ</translation>
+ <translation>フォルダー</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="52"/>
@@ -1533,18 +1546,18 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="215"/>
<source>No more storage space available on server.</source>
- <translation>サーバー上で利用可能なストレージ容量が足りません。</translation>
+ <translation>サーバー上で利用可能なストレージ領域が足りません。</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="287"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation>以前のエラーが発生した為、無視したファイルがありません</translation>
+ <translation>前にエラーが発生したため、無視するファイルはありません</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="289"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
- <translation>以前のエラーが発生した為、%1 のファイルが無視されていました。
+ <translation>以前のエラーが発生したため、%1 のファイルが無視されていました。
もう一度同期を実行してください。</translation>
</message>
</context>
@@ -1651,7 +1664,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="107"/>
<source><h3>Issuer</h3></source>
- <translation type="unfinished"/>
+ <translation><h3>発行者</h3></translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="110"/>
@@ -1820,12 +1833,12 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>Folder %1: %2</source>
- <translation>フォルダ %1: %2</translation>
+ <translation>フォルダー %1: %2</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="209"/>
<source>No sync folders configured.</source>
- <translation>同期フォルダが設定されていません。</translation>
+ <translation>同期フォルダーが設定されていません。</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="234"/>
@@ -1840,17 +1853,17 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="255"/>
<source>Open %1 folder</source>
- <translation>%1 フォルダを開く</translation>
+ <translation>%1 フォルダーを開く</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="265"/>
<source>Managed Folders:</source>
- <translation>管理フォルダ:</translation>
+ <translation>管理フォルダー:</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="268"/>
<source>Open folder '%1'</source>
- <translation>フォルダ ’%1’ を開く</translation>
+ <translation>フォルダー ’%1’ を開く</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="344"/>
@@ -1945,7 +1958,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="69"/>
<source>&Local Folder</source>
- <translation>ローカルフォルダ(&L)</translation>
+ <translation>ローカルフォルダー(&L)</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="85"/>
@@ -1975,7 +1988,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
- <translation><small>新しい設定で同期する前にローカルフォルダのコンテンツを削除する。</small></translation>
+ <translation><small>新しい設定で同期する前にローカルフォルダーのコンテンツを削除する。</small></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
@@ -2120,7 +2133,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.ui" line="69"/>
<source>Your entire account is synced to the local folder </source>
- <translation>すべてのアカウントはローカルフォルダと同期されます</translation>
+ <translation>すべてのアカウントはローカルフォルダーと同期されます</translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.ui" line="103"/>
@@ -2314,7 +2327,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/theme.cpp" line="60"/>
<source>Sync Success, some files were ignored.</source>
- <translation>シンク完了しました。無視したファイルがありました。</translation>
+ <translation>同期が完了しました。一部のファイルを無視しました。</translation>
</message>
<message>
<location filename="../src/mirall/theme.cpp" line="63"/>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 899b8f6..f04a26c 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Verbinding mislukt</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSync kon geen lock file maken.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync kon de state db niet laden.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync kon de state db niet schrijven.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync kon geen geheugen reserveren.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatale parameter fout.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync verwerkingsstap bijwerken mislukt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync verwerkingsstap verzamelen mislukt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync verwerkingsstap doorzetten mislukt.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync ongedefinieerde fout.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>verbindingstime-out</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Er trad een HTTP transmissiefout plaats.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync kreeg geen toegang</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Afgebroken door de gebruiker</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Een interne fout met nummer %1 is opgetreden.</translation>
</message>
@@ -1401,25 +1401,38 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -1427,7 +1440,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Kon map %1 niet verwijderen</translation>
</message>
@@ -1435,12 +1448,12 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1448,13 +1461,13 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 7d566e2..c121e0f 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Połączenie nie powiodło się</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSync nie mógł utworzyć pliku blokady.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync nie mógł wczytać bazy danych stanu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync nie udało się zapisać stanu db.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<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="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Krytyczny błąd parametru CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Nieokreślony błąd CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Upłynął limit czasu połączenia.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Wystąpił błąd transmisji HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>Synchronizacja nieudana z powodu braku dostępu</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Anulowane przez użytkownika</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Wystąpił błąd wewnętrzny numer %1.</translation>
</message>
@@ -1394,25 +1394,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Nie mogę usunąć katalogu %1</translation>
</message>
@@ -1428,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1441,13 +1454,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 32f88d5..962c342 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -240,169 +240,169 @@
<translation>CSync falhou a criação do ficheiro de lock.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>Csync falhou a carregar a base de dados de status.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<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="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Parametro errado, CSync falhou</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync: Processo de reconciliação falhou.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync: erro não especificado</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Ocorreu o erro interno %1.</translation>
</message>
@@ -1395,25 +1395,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1421,7 +1434,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1429,12 +1442,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1442,13 +1455,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index ee3f21b..581048b 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Selecionar uma pasta de destino remota</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Conexão falhou</translation>
</message>
@@ -240,168 +240,168 @@
<translation>Falha ao criar o arquivo de trava pelo CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync falhou ao carregar a base de estado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>Csync não conseguiu escrever o estado no bd.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falhou ao reservar memória.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Erro fatal permanente do CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Erro não especificado no CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>Falha no acesso CSync</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Abortado pelo usuário</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Um erro interno número %1 ocorreu.</translation>
</message>
@@ -1399,25 +1399,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi abortada pelo usuário.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar diretório %1</translation>
</message>
@@ -1425,7 +1438,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>O diretório %1 não pode ser removido</translation>
</message>
@@ -1433,12 +1446,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1446,13 +1459,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Arquivo local alterado durante a sincronização, sincronizando uma vez que chegou completamente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi abortada pelo usuário.</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 4069aab..92e4b28 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Сбой подключения</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSync не удалось создать файл блокировки.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync не удалось загрузить базу данных состояния.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync не удалось записать состояние базы данных.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync не удалось обнаружить тип файловой системы.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync получил сообщение об ошибке при обработке внутренних деревьев.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не удалось зарезервировать память.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Фатальная ошибка параметра CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>Процесс обновления CSync не удался.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>Процесс согласования CSync не удался.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>Процесс передачи CSync не удался.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Локальная файловая система не доступна для записи. Пожалуйста, проверьте права пользователя.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync не удалось подключиться через прокси.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не удалось авторизоваться на прокси сервере.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не удалось найти прокси сервер.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не удалось аутентифицироваться на сервере %1.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync упал в связи с отутствием обработки из-за отказа в доступе.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync пытался создать директорию, которая уже существует.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Нет доступного пространства на сервере %1 server.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Неизвестная ошибка CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation>Путь не синхронизируется из-за произошедших ошибок:</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не удалось подключиться к сети.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Произошёл таймаут соединения сети.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Произошла ошибка передачи http.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync не имеет доступа</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Прервано пользователем</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Произошла внутренняя ошибка номер %1.</translation>
</message>
@@ -1401,25 +1401,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>не удалось создать директорию %1</translation>
</message>
@@ -1427,7 +1440,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Невозможно удалить директорию %1</translation>
</message>
@@ -1435,12 +1448,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
@@ -1448,13 +1461,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Локальный файл изменился в процессе синхронизации, повторяем процесс</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 270862b..304e214 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Spojenie zlyhalo</translation>
</message>
@@ -240,168 +240,168 @@
<translation>Vytvorenie "zamykacieho" súboru cez "CSync" zlyhalo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>Načítanie stavu databázy vrámci "CSync" zlyhalo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync zlyhal pri zápise do databázy stavu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync sa nepodarilo zarezervovať pamäť.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync kritická chyba parametrov.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync sa nepodarilo spracovať krok zladenia.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync nešpecifikovaná chyba.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Chyba HTTP prenosu.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync nepodaril prístup</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Zrušené používateľom</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Vyskytla sa interná chyba číslo %1.</translation>
</message>
@@ -1399,25 +1399,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizácia zrušená používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>nepodarilo sa vytvoriť priečinok %1</translation>
</message>
@@ -1425,7 +1438,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Nemožno odstrániť priečinok %1</translation>
</message>
@@ -1433,12 +1446,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1446,13 +1459,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizácia zrušená používateľom.</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 491bd05..d79a5e4 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Povezava je spodletela</translation>
</message>
@@ -240,168 +240,168 @@
<translation>Ustvarjanje datoteke zaklepa s CSync je spodletelo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>Nalaganje podatkovne zbirke stanj s CSync je spodletelo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>Zapisovanje stanja podatkovne zbirke CSync je spodletelo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<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="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Usodna napaka parametra CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>Korak opravila posodobitve CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>Korak opravila poravnave CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Nedoločena napaka CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<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="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Poskus vzpostavitve povezave je časovno potekel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>Dostop s CSync je spodletel</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Prišlo je do notranje napake s številko %1.</translation>
</message>
@@ -1401,25 +1401,38 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>ni mogoče ustvariti mape %1</translation>
</message>
@@ -1427,7 +1440,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>ni mogoče odstraniti mape %1</translation>
</message>
@@ -1435,12 +1448,12 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1448,13 +1461,13 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Usklajevanje je prekinil uporabnik.</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 925bccf..472a510 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -240,168 +240,168 @@
<translation>CSync misslyckades med att skapa en låsfil.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync misslyckades ladda status db.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync misslyckades med att skriva till status db.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync misslyckades att reservera minne.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatal parameter fel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync processteg update misslyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync processteg reconcile misslyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync processteg propagate misslyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync ospecificerat fel.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Ett anslutningsfel mot nätverket uppstod.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Ett HTTP överföringsfel inträffade.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Avbruten av användare</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Internt fel nummer %1 uppstod.</translation>
</message>
@@ -1399,25 +1399,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1425,7 +1438,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>Kunde ej ta bort mappen %1</translation>
</message>
@@ -1433,12 +1446,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1446,13 +1459,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 1c9e8aa..32bcc17 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -240,168 +240,168 @@
<translation>CSync ล้มเหลวในการสร้างไฟล์ล็อคข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync ล้มเหลวในการโหลดข้อมูลสถานะฐานข้อมูล</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync ไม่สามารถตรวจพบประเภทของไฟล์ในระบบได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>การจัดสรรหน่วยความจำ CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>การปรับปรุงขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>การถ่ายทอดขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>ระบบไฟล์ในพื้นที่ไม่สามารถเขียนข้อมูลได้ กรุณาตรวจสอบสิทธิ์การเข้าใช้งาน</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync ล้มเหลวในการเชื่อมต่อผ่านทางพร็อกซี่</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>หมดเวลาการเชื่อมต่อเครือข่าย</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>เกิดข้อผิดพลาดภายในระบบหมายเลข %1</translation>
</message>
@@ -1394,25 +1394,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1428,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1441,13 +1454,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index b8616bb..07b8315 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -240,168 +240,168 @@
<translation>CSync не вдалося створити файл блокування.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync не вдалося завантажити стан бази даних.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync не вдалося визначити тип файлової системи.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>У CSync виникла помилка під час сканування внутрішньої структури каталогів.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не вдалося зарезервувати пам'ять.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>У CSync сталася фатальна помилка параметра.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync не вдалася зробити оновлення .</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync не вдалася зробити врегулювання.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync не вдалася зробити розповсюдження.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>Не можливо проводити запис у локальну файлову систему. Будь ласка, перевірте повноваження.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync не вдалося приєднатися через Проксі.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не вдалося знайти Проксі або Сервер.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не вдалося аутентифікуватися на %1 сервері.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync завершився неуспішно через порушення прав доступу.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync намагалася створити каталог, який вже існує.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: на сервері %1 скінчилося місце.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>Невизначена помилка CSync.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не вдалося приєднатися до мережі.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>Час під'єднання до мережі вичерпався.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>Сталася помилка передачі даних по HTTP.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Виникла внутрішня помилка за номером %1 .</translation>
</message>
@@ -1394,25 +1394,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1428,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1441,13 +1454,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 2c17988..e92977b 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -240,168 +240,168 @@
<translation>CSync 无法创建文件锁。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync 无法加载状态数据库。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync 无法检测文件系统类型。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 在处理内部文件树时出错。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 失败，内存不足。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 致命参数错误。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync 处理步骤更新失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 处理步骤调和失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync 处理步骤传播失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>本地文件系统不可写。请检查权限。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync 未能通过代理连接。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 无法查询代理或服务器。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 于 %1 服务器认证失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>出于未处理的权限拒绝，CSync 失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync 尝试创建了已有的文件夹。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：%1 服务器空间已满。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync 未定义错误。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 联网失败。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>网络连接超时。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 传输错误。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>发生内部错误 %1</translation>
</message>
@@ -1394,25 +1394,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1428,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1441,13 +1454,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index f0f1ee8..dfdbb82 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -240,168 +240,168 @@
<translation>CSync 無法建立文件鎖</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSync 無法讀取狀態資料庫</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<source>CSync could not detect the filesystem type.</source>
<translation>CSync 無法偵測檔案系統的類型</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 處理內部資料樹時發生錯誤</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 無法取得記憶體空間。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 參數錯誤。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync 處理步驟 "update" 失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 處理步驟 "reconcile" 失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<source>CSync processing step propagate failed.</source>
<translation>CSync 處理步驟 "propagate" 失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<source>The local filesystem can not be written. Please check permissions.</source>
<translation>本地檔案系統無法寫入，請確認權限。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<source>CSync failed to connect through a proxy.</source>
<translation>CSync 透過代理伺服器連線失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 查詢代理伺服器或伺服器失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 於伺服器 %1 認證失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<source>CSync failed due to not handled permission deniend.</source>
<translation>CSync 失敗，由於未處理的存取被拒。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<source>CSync tried to create a directory that already exists.</source>
<translation>CSync 試圖建立一個已經存在的目錄。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：伺服器 %1 沒有可用空間。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync 未知的錯誤。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<source>The item is not synced because of previous errors:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 無法連接到網路。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<source>A network connection timeout happend.</source>
<translation>網路連線逾時。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 傳輸錯誤。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>發生內部錯誤，錯誤編號 %1</translation>
</message>
@@ -1394,25 +1394,38 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1428,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1441,13 +1454,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index df51e19..5e29fa7 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Bir uzak hedef klasörü seçin</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="281"/>
+ <location filename="../src/mirall/application.cpp" line="282"/>
<source>Connection failed</source>
<translation>Bağlantı başarısız</translation>
</message>
@@ -240,168 +240,168 @@
<translation>CSynk arkiv kapi yampadi. </translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
- <source>CSync failed to load the state db.</source>
- <translation>CSynk db gondermedi. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
- <source>CSync failed to write the state db.</source>
- <translation>CSync durum db yazması başarısız.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="95"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="96"/>
<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="98"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="99"/>
<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="103"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="104"/>
<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="106"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="107"/>
<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="109"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync bellek ayıramadı.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="112"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync ölümcül parametre hatası</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="115"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="116"/>
<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="118"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="119"/>
<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="121"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="122"/>
<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="124"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="125"/>
<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="128"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="129"/>
<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="132"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="133"/>
<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="135"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="136"/>
<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="138"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="139"/>
<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="141"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="142"/>
<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="144"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="145"/>
<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="156"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="157"/>
<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="162"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="163"/>
<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="165"/>
- <location filename="../src/mirall/csyncthread.cpp" line="168"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="166"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="169"/>
<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="171"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="172"/>
<source>CSync unspecified error.</source>
<translation>CSync belirtilmemiş hata.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="237"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="238"/>
<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="273"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="274"/>
<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="276"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="277"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="279"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="280"/>
<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="447"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="448"/>
<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="147"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="148"/>
<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="150"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/csyncthread.cpp" line="151"/>
<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="153"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="154"/>
<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="159"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="160"/>
<source>CSync failed to access </source>
<translation>CSync erişemedi</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="174"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="175"/>
<source>Aborted by the user</source>
<translation>Kullanıcı tarafından iptal edildi</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="178"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="179"/>
<source>An internal error number %1 happend.</source>
<translation>Hata iceri numarali %</translation>
</message>
@@ -1400,25 +1400,38 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="519"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
<source>Sync was aborted by user.</source>
<translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="574"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="584"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
<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="126"/>
+ <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="128"/>
+ <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="181"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="212"/>
<source>could not create directory %1</source>
<translation>%1 dizini oluşturulamadı</translation>
</message>
@@ -1426,7 +1439,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="160"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="191"/>
<source>Could not remove directory %1</source>
<translation>%1 dizini kaldırılamadı</translation>
</message>
@@ -1434,12 +1447,12 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="856"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
<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="858"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
<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>
@@ -1447,13 +1460,13 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="328"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="382"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
<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>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="331"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="368"/>
<source>Sync was aborted by user.</source>
<translation>Eşitleme kullanıcı tarafından iptal edildi.</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