[Pkg-owncloud-commits] [owncloud-client] 163/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:48 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 f79765a5364ba367ba0afeb54ea499ecb0fc5428
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Tue Mar 18 01:26:28 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_cs.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_de.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_el.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_en.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_es.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_es_AR.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_et.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_eu.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_fa.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_fi.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_fr.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_gl.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_hu.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_it.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_ja.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_nl.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_pl.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_pt.ts | 435 +++++++++++++++++++++----------------------
translations/mirall_pt_BR.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_ru.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_sk.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_sl.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_sv.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_th.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_uk.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_zh_CN.ts | 434 +++++++++++++++++++++---------------------
translations/mirall_zh_TW.ts | 434 +++++++++++++++++++++---------------------
translations/pofiles/tr.po | 434 +++++++++++++++++++++---------------------
29 files changed, 6293 insertions(+), 6294 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index b46d147..d6391a8 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota</b> Algunes carpetes, incloent els fitxers muntats a través de xarxa o compartits, poden tenir límits diferents.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Confirma l'eliminació de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Voleu aturar la sincronització de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Això no eliminarà els fitxers del client.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Confirmeu la reinicialització de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>S'està sincronitzant</translation>
</message>
@@ -181,27 +181,27 @@
<translation>No hi ha cap compte configurat</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>S'està sincronitzant.<br/>Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connectat a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, fitxer %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connectat a <a href="%1">%2</a> com a <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Èxit.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync ha fallat en crear un fitxer de bloqueig.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <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="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Error fatal de paràmetre en CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Error inespecífic de CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation>La sincronització d'enllaços simbòlics no està implementada.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation>El fitxer està a la llista d'ignorats.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <source>File contains invalid characters that can not be synced cross platform.</source>
- <translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation>No es pot inicialitzar un periòdic de sincronització</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <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="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>CSync ha fallat en accedir</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Aturat per l'usuari</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>S'ha produït l'error intern número %1</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Aquesta sincronització eliminarà tots els fitxers a la carpeta local de sincronització '%1'.
Si vós o l'administrador heu reinicialitzat el compte en el servidor, escolliu "Mantenir fitxers". Si voleueliminar les dades, escolliu "Esborra tots els fitxers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -819,12 +640,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Escriviu contrasenya</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>El fitxer '%1'<br/>no es pot obrir en mode escriptura.<br/><br/>La sortida del registre <b>no</b> es pot desar!</nobr></translation>
</message>
@@ -1833,6 +1654,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 0609171..11f447c 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pozastavit</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Poznámka:</b> Některé složky, včetně síťových či sdílených složek, mohou mít jiné limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Obnovit</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdit odstranění složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Opravdu chcete zastavit synchronizaci složky <i>%1</i>?</p><p><b>Poznámka:</b> Tato akce nesmaže soubory z místní složky.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdit restartování složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 místa na disku použito.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Žádné spojení s %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Připojeno k <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 z %2, soubor %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Připojeno k <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Momentálně nejsou k dispozici žádné informace o využití úložiště</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Úspěch.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync nemůže vytvořit zámek.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync se nezdařilo rezervovat paměť.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync: kritická chyba parametrů.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Nespecifikovaná chyba CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis v lokální synchronizované složce.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync se nepodařilo zapsat do souboru žurnálu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Nastala chyba HTTP přenosu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation>CSync se nezdařil přístup</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Zrušeno uživatelem</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Nastala vnitřní chyba číslo %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Tato synchronizace by smazala všechny soubory v místní složce '%1'
Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte "Ponechat soubory". Pokud chcete místní data odstranit, zvolte "Odstranit všechny soubory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -819,12 +640,12 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Zadejte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation>
</message>
@@ -947,12 +768,12 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Soubor '%1'<br/>nelze otevřít pro zápis.<br/><br/>Výstup záznamu <b>nelze</b> uložit.</nobr></translation>
</message>
@@ -1839,6 +1660,185 @@ Zkuste provést novou synchronizaci.
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index d89fd6b..556654e 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Anhalten</translation>
</message>
@@ -119,60 +119,60 @@
<translation><b>Hinweis:</b> Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner, können unterschiedliche Beschränkungen haben.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Fortsetzen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Löschen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Wollen Sie wirklich die Synchronisation des Ordners <i>%1</i> beenden?</p><p><b>Anmerkung:</b> Dies wird keine Dateien von ihrem Rechner löschen.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Zurücksetzen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Wollen Sie wirklich den Ordner <i>%1</i> zurücksetzen und die Datenbank auf dem Klient neu aufbauen?</p><p><b>Anmerkung:</b>
Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) von %2 Serverkapazität in Benutzung.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Keine Verbindung mit %1 zu <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
@@ -182,27 +182,27 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbunden mit <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbunden mit <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
@@ -231,185 +231,6 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Erfolgreich</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync konnte keine lock-Datei erstellen.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync konnte keinen Speicher reservieren.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>CSync Verarbeitungsschritt "Übertragung" fehlgeschlagen.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync unbekannter Fehler.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync konnte den Synchronisationsbericht nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte auf das lokale Synchronisationsverzeichnis haben.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync konnte den Synchronisationsbericht nicht schreiben.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>CSync-Zugriff fehlgeschlagen</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Abbruch durch den Benutzer</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Interne Fehlernummer %1 aufgetreten.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -460,80 +281,80 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 und %2 andere Dateien wurden aktualisiert</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 wurde in %2 umbenannt und %3 andere Dateien wurden umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 wurde in %2 verschoben und %3 andere Dateien wurden verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner '%1' entfernen.
Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie "Dateien behalten". Wenn Sie ihre Daten löschen wollen, wählen Sie "Alle Dateien entfernen".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -542,17 +363,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -820,12 +641,12 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Passwort eingeben</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation>
</message>
@@ -948,12 +769,12 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Datei '%1'<br/>kann nicht zum Schreiben geöffnet werden.<br/><br/>Die Protokolldatei kann <b>nicht</b> gespeichert werden!</nobr></translation>
</message>
@@ -1839,6 +1660,185 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 8fa1e19..c2221f0 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Παύση</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Σημείωση:</b> Κάποιοι φάκελοι, συμπεριλαμβανομένων των δικτυακών δίσκων ή των κοινόχρηστων φακέλων, μπορεί να έχουν διαφορετικά όρια. </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Συνέχεια</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Επιβεβαίωση αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Θέλετε στ' αλήθεια να σταματήσετε το συγχρονισμό του φακέλου <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό δεν θα αφαιρέσει τα αρχεία από το δέκτη.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του πελάτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 από %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Δεν υπάρχει σύνδεση με το %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Ο Συγχρονισμός Εκτελείται</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Επιτυχία.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>Το CSync απέτυχε να δημιουργήσει ένα αρχείο κλειδώματος.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation>To CSync δεν μπορούσε να ανιχνεύσει τον τύπο του αρχείου συστήματος.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>Το CSync απέτυχε να διατηρήσει τη μνήμη.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync μοιραίο σφαλμα παράμετρου.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSync ενημέρωση στάδιο επεξεργασίας απέτυχε. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>Η προώθηση του CSync απέτυχε.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <source>The local filesystem can not be written. Please check permissions.</source>
- <translation>Το τοπικό σύστημα αρχείων δεν μπορεί να εγγράψει. Παρακαλούμε ελέγξτε τα δικαιώματα.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation>Το CSync απέτυχε να συνδεθεί μέσω ενός proxy. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation>CSync αδυναμία ελέγχου ταυτότητας στο διακομιστή μεσολάβησης.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation>CSync απέτυχε να lookup μεσολάβησης ή διακομιστή. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation>CSync απέτυχε τον έλεγχο ταυτότητας στο 1% διακομιστή. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync απέτυχε λόγω μη γίνεται deniend άδεια. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>Το CSync προσπαθησε να δημιουργησει εναν χωρο αποθηκευσης που υπηρχε ηδη.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation>CSync: Δεν υπαρχει διαθεσιμος χωρος στον %1 διακομιστη.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync αγνωστο σφαλμα.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Αυτό το αντικείμενο δεν θα συγχρονιστεί λόγω προηγούμενων σφαλμάτων:</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <source>File contains invalid characters that can not be synced cross platform.</source>
- <translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταλόγου. Βεβαιωθείτε ότι έχετε άδειες ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>Το CSync απέτυχε να εγγράψει στο αρχείο καταλόγου.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Συνέβη ένα χρονικό όριο σύνδεσης δικτύου. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Ματαιώθηκε από το χρήστη</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Ένα εσωτερικό σφάλμα με αριθμό %1 συνέβη.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation> %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Αυτός ο συγχρονισμός θα αφαιρέσει όλα τα αρχεία στον τοπικό φάκελο συγχρονισμού '%1'.
Εάν εσείς ή ο διαχειριστής σας επαναφέρατε τον λογαριασμό σας στο διακομιστή, επιλέξτε "Διατήρηση αρχείων". Εάν θέλετε να αφαιρεθούν τα δεδομένα σας, επιλέξτε "Αφαίρεση όλων των αρχείων".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -819,12 +640,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Το αρχειο '%1'<br/>δεν μπορει να ανοιχθει για το γραψιμο.<br/><br/>Το αρχείο καταγραφής δεν <b>μπορεί</b> να αποθηκευτεί!</nobr> </translation>
</message>
@@ -1837,6 +1658,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 1caab16..eab76d2 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -91,7 +91,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation type="unfinished"></translation>
</message>
@@ -121,59 +121,59 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
@@ -183,27 +183,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
@@ -232,185 +232,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -461,96 +282,96 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -818,12 +639,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"></translation>
</message>
@@ -944,12 +765,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation type="unfinished"></translation>
</message>
@@ -1830,6 +1651,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <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/syncengine.cpp" line="103"/>
+ <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/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 265d6c9..7793907 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algunas carpetas, incluyendo unidades de red o carpetas compartidas, pueden tener límites diferentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar la eliminación de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Realmente desea dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Note:</b> Esto no eliminará los archivos de su cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Confirme que desea restablecer la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 espacio usado en el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>No hay conexión a %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
@@ -181,27 +181,27 @@
<translation>No se ha configurado la cuenta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Completado con éxito.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync no pudo crear un fichero de bloqueo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>Fallo al reservar memoria para Csync</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Error fatal de parámetro en CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Error no especificado de CSync</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync falló al escribir el archivo de diario.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>Error al acceder CSync</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Interrumpido por el usuario</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Ha ocurrido un error interno con número %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido eliminados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido descargados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 y %2 otros archivos han sido actualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 ha sido renombrado a %2 y %3 otros archivos han sido renombrados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 ha sido movido a %2 y %3 otros archivos han sido movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización '%1'.
Si ud. o su administrador han restablecido su cuenta en el servidor, elija "Conservar Archivos". Si desea eliminar toda su información, elija "Eliminar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -819,12 +640,12 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Introduzca la Contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, introduzca su %1 contraseña para el usuario '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Archivo '%1'<br/>no se puede abrir para escritura.<br/><br/>¡El archivo de registro <b>no</b> puede ser guardado!</nobr></translation>
</message>
@@ -1838,6 +1659,185 @@ Intente sincronizar los archivos nuevamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index c97ed5a..565e52c 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algunas carpetas, incluidas las montadas en red o las carpetas compartidas, pueden tener diferentes límites.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Confirmá la eliminación del directorio</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>¿Realmente deseas detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b>Estp no removerá los archivos desde tu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Confirme el reseteo de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p>< [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
@@ -181,27 +181,27 @@
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Éxito.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>Se registró un error en CSync cuando se intentaba crear un archivo de bloqueo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync falló al reservar memoria.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Error fatal de parámetro en CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Error no especificado de CSync</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>CSync falló al acceder</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Interrumpido por el usuario</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Error: ocurrió un error del tipo %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización borraría todos los archivos en la carpeta local de sincronización '%1'.
Si vos o el administrador resetearon tu cuenta en el servidor, elegí "Conservar Archivos". Si querés borrar toda tu información, elegí "Borrar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -819,12 +640,12 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Ingresar contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>El archivo '%1'<br/>no puede ser abierto para escritura.<br/><br/>¡El archivo de log <b>no</b> puede ser guardado!</nobr></translation>
</message>
@@ -1834,6 +1655,185 @@ Intente sincronizar estos nuevamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index f42be9b..135c677 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Märkus:</b> Mõned kataloogid, sealhulgas võrgust ühendatud või jagatud kataloogid, võivad omada erinevaid limiite.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Taasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Kinnita kausta eemaldamist</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Kas tõesti soovid peatada kataloogi <i>%1</i> sünkroniseerimist?.</p><p><b>Märkus:</b> See ei eemalda faile sinu kliendist.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Kinnita kataloogi algseadistus</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ühendatud <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 / %2, fail %3 / %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Ühendatud <a href="%1">%2</a> kui <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Korras.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync lukustusfaili loomine ebaõnnestus.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync ei suutnud mälu reserveerida.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync parameetri saatuslik viga.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSync uuendusprotsess ebaõnnestus.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync tasakaalustuse protsess ebaõnnestus.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>CSync edasikandeprotsess ebaõnnestus.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync tuvastamatu viga.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Csync ei suutnud avada või luua registri faili. Tee kindlaks et sul on õigus lugeda ja kirjutada kohalikus sünkrooniseerimise kataloogis</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync ei suutnud luua registri faili.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Toimus võrgukatkestus.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>HTTP ülekande viga.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation>CSyncile ligipääs ebaõnnestus</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Kasutaja poolt tühistatud</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Tekkis sisemine viga number %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>See sünkroniseering kustutab kõik failid kohalikust kataloogist '%1'.⏎
Kui sina või adminstraator on sinu konto serveris algseadistanud, siis vali "Säilita failid". Kui soovid oma andmed kustutada, vali "Kustuta kõik failid".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -819,12 +640,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Sisesta parool</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Palun sisesta %1 parool kasutajale '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Viga</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Faili '%1'<br/>ei saa kirjutamiseks avada.<br/><br/>Logi väljundit <b>ei saa</b> salvestada!</nobr></translation>
</message>
@@ -1838,6 +1659,185 @@ Proovi neid uuesti sünkroniseerida.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 721dfe5..6599b1e 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pausarazi</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Oharra:</b>Karpeta batzuk, sarekoa edo partekatutakoak, muga ezberdinak izan ditzazkete.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Berrekin</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Baieztatu karpetaren ezabatzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Baieztatu Karpetaren Leheneratzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a>ra konektatuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Arrakasta.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSyncek huts egin du lock fitxategia sortzean.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSyncek huts egin du memoria alokatzean.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync parametro larri errorea.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation>CSyncek ezin izan du proxya autentikatu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSyncen zehaztugabeko errorea.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <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="280"/>
- <source>File is listed on the ignore list.</source>
- <translation>Fitxategia baztertutakoen zerrendan dago.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <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="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Sarearen konexioan denbora-muga gertatu da.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>HTTP transmisio errore bat gertatu da.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Erabiltzaileak bertan behera utzita</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Barne errore bat gertatu da, zenbakia %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,96 +280,96 @@
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -816,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Sartu Pasahitza</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation>
</message>
@@ -944,12 +765,12 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Errorea</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>'%1' Fitxategia<br/> ezin da idazteko ireki.<br/><br/>Egunkariaren irteera <b>ezin</b> da gorde!</nobr></translation>
</message>
@@ -1831,6 +1652,185 @@ Saiatu horiek berriz sinkronizatzen.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index db0f96b..ab4b1e6 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>توقف کردن</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>قبول کردن پاک شدن پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>موفقیت</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync موفق به ایجاد یک فایل قفل شده، نشد.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation>CSync نوع فایل های سیستم را نتوانست تشخیص بدهد.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync موفق به رزرو حافظه نشد است.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>مرحله گسترش پردازش CSync ناموفق بود.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <source>The local filesystem can not be written. Please check permissions.</source>
- <translation>بر روی فایل سیستمی محلی نمی توانید چیزی بنویسید.لطفا مجوزش را بررسی کنید.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation>عدم موفقیت CSync برای اتصال از طریق یک پروکسی.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation>عدم موفقیت CSync برای مراجعه به پروکسی یا سرور.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation>عدم موفقیت CSync برای اعتبار دادن در %1 سرور.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation>خطای نامشخص CSync </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation>عدم موفقیت CSync برای اتصال به شبکه.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>اتصال به یک شبکه متوقف شده است.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>خطا در انتقال HTTP اتفاق افتاده است.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>یک خطای داخلی به شماره ی %1 اتفاق افتاد.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,96 +280,96 @@
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -816,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -942,12 +763,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation type="unfinished"/>
</message>
@@ -1828,6 +1649,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 2b26da2..600a83d 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Keskeytä</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Jatka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Vahvista kansion poisto</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 palvelimen tilasta käytössä.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Muodosta yhteys - <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1/%2, tiedosto %3/%4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Onnistui.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>Csync ei onnistunut luomaan lukitustiedostoa.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync ei onnistunut varaamaan muistia.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync - määrittämätön virhe.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <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="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Verkon aikakatkaisuvirhe.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Tapahtui HTTP-välitysvirhe.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Tapahtui sisäinen virhe %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,96 +280,96 @@
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -816,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Anna salasana</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Anna käyttäjän '%2' %1-salasana:</translation>
</message>
@@ -942,12 +763,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Virhe</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Tiedostoa '%1'<br/>ei voida avata kirjoittamista varten.<br/><br/>Lokitulostusta<b>ei</b>pystytä tallentamaan!</nobr></translation>
</message>
@@ -1830,6 +1651,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 5d75f54..c72f74f 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Mettre en pause</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Note :</b> Certains fichiers, incluant des dossiers montés depuis le réseau ou des dossiers partagés, peuvent avoir des limites différentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Reprendre</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Confirmer le retrait du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Voulez-vous réellement arrêter la synchronisation du dossier <i>%1</i> ?</p><p><b>Note : </b> Cela ne supprimera pas les fichiers sur votre client.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Confirmation de la réinitialisation du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 d'espace utilisé sur le serveur.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Aucune connexion à %1 à <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La synchronisation est en cours.<br/>Voulez-vous y mettre un terme?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connecté à <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, fichier %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connecté à <a href="%1">%2</a> en tant que <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Succès.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync n'a pas pu créer le fichier de verrouillage.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <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="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Erreur fatale CSync : mauvais paramètre.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Erreur CSync inconnue.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture/écriture dans le répertoire de synchronisation local.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync n’a pu écrire le fichier de journalisation.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>Echec de CSync pour accéder</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Abandonné par l'utilisateur</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Une erreur interne numéro %1 est survenue.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été supprimés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été téléchargés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 et %2 autres fichiers ont été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 a été renommé en %2 et %3 autres fichiers ont été renommés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 a été déplacé vers %2 et %3 autres fichiers ont été déplacés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Cette synchronisation supprimerait tous les fichiers du dossier local de synchronisation '%1'.
Si vous-même ou votre administrateur avez réinitialisé votre compte sur le serveur, choisissez "Garder les fichiers". Si vous voulez que vos données soient supprimées, choisissez "Supprimer tous les fichiers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -819,12 +640,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Entrez le mot de passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Le fichier '%1'<br/>ne peut être ouvert en écriture.<br/><br/>La sortie <b>ne peut pas</b> être consignée dans un fichier de log !</nobr></translation>
</message>
@@ -1838,6 +1659,185 @@ Il est déconseillé de l'utiliser.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 576f0c8..bff3483 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algúns cartafoles, como os cartafoles de rede montados ou os compartidos, poden ten diferentes límites.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar a eliminación do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Confirma que quere deter a sincronización do cartafol <i>%1</i>?</p><p><b>Nota:</b> Isto non retirará os ficheiros no seu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar o restabelecemento do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation> Espazo usado do servidor %1 (%3%) de %2.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Sen conexión con %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Estase realizando a sincronización.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Correcto.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>Produciuse un fallo en CSync ao crear un ficheiro de bloqueo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <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="117"/>
- <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="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Produciuse un erro non especificado de CSync</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Produciuse un fallo do Csync ao cargar ou crear o ficheiro de rexistro. Asegúrese de que ten permisos de lectura e escritura no directorio de sincronización local.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>Produciuse un fallo en CSync ao escribir o ficheiro de rexistro.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>Produciuse un fallo ao acceder a CSync</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Interrompido polo usuario</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Produciuse un erro interno número %1. </translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron retirados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron descargados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>O ficheiro %1 e outros %2 foron enviados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado satisfactoriamente a %2 e outros %3 tamén foron renomeados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido satisfactoriamente a %2 e outros %3 tamén foron movidos satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización retirará todos os ficheiros do cartafol local de sincronización «%1».
Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros».</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -819,12 +640,12 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Escriba o contrasinal</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriba o contrasinal %1 para o usuario «%2»:</translation>
</message>
@@ -947,12 +768,12 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>O ficheiro «%1»<br/> non se pode abrir para escritura.<br/><br/>A saída do rexistro <b>non</n> se pode gardar!</nobr></translation>
</message>
@@ -1838,6 +1659,185 @@ Tente sincronizalos de novo.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 83f33f6..1fbd1d4 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Szünet</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Folytatás</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Könyvtár törlésének megerősítése</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Szinkronizálás fut</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nincs beállított kapcsolat.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Sikerült.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>A CSync nem tudott létrehozni lock fájlt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>Hiba a CSync memórifoglalásakor.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync hibás paraméterhiba.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync ismeretlen hiba.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <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="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>HTTP átviteli hiba történt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Belső hiba történt, száma: %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,96 +280,96 @@
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>El legyen távolítva az összes fájl?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -816,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Jelszómegadás</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -942,12 +763,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>'%1' fájlt<br/>nem lehet írásra megnyitni.<br/><br/>A naplózás kimenete <b>nem</b> menthető!</nobr></translation>
</message>
@@ -1828,6 +1649,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 9cb8163..fccbddf 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> alcune cartelle, incluse le cartelle montate o condivise in rete, potrebbero avere limiti diversi.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Riprendi</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Conferma la rimozione della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ciò non rimuoverà i file dal tuo client.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Conferma il ripristino della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 di %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) di %2 spazio in uso sul server.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nessuna connessione a %1 su <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connesso a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 di %2, file %3 di %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connesso a <a href="%1">%2</a> come <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Successo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync non è riuscito a creare il file di lock.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <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="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Errore grave di parametro di CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Errore non specificato di CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync non è riuscito a caricare o a creare il file journal. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync non è riuscito a scrivere il file journal.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>CSync non è riuscito ad accedere</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Interrotto dall'utente</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>SI è verificato un errore interno numero %1</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati rimossi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati scaricati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 altri file sono stati aggiornati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 è stato rinominato in %2 e %3 altri file sono stati rinominati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 è stato spostato in %2 e %3 altri file sono stati spostati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale '%1'.
Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli "Mantieni i file". Se desideri che i dati siano rimossi, scegli "Rimuovi tutti i file".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -819,12 +640,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Digita la password</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Digita la password di %1 per l'utente '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Il file '%1'<br/>non può essere aperto in scrittura.<br/><br/>Il risultato del log <b>non</b> può essere salvato!</nobr></translation>
</message>
@@ -1837,6 +1658,185 @@ Prova a sincronizzare nuovamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index c0b2d03..c00993f 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>一時停止</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>注:</b> 外部ネットワークストレージ、共有フォルダーを含んだフォルダーの場合は、上限値が異なることがあります。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>フォルダーの削除を確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>フォルダー<i>%1</i>の同期を本当に止めますか？</p><p><b>注:</b> これによりクライアントからファイルが削除されることはありません。</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>フォルダーのリセットを確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 使用中のサーバー領域</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation><a href="%2">%3</a> に %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
@@ -181,27 +181,27 @@
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> へ接続しました。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, ファイル数 %3 of %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a> に <i>%3</i> として接続</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>成功。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSyncがロックファイルの作成に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation>CSyncはファイルシステムタイプを検出できませんでした。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSyncで使用するメモリの確保に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSyncの致命的なパラメータエラーです。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSyncの処理ステップの更新に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSyncの処理ステップの調停に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>CSyncの処理ステップの伝播に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <source>The local filesystem can not be written. Please check permissions.</source>
- <translation>ローカルファイルシステムは書き込みができません。パーミッションをチェックしてください。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation>CSyncがプロキシ経由での接続に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation>CSyncはそのプロキシで認証できませんでした。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation>CSyncはプロキシもしくはサーバーの参照に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation>CSyncは %1 サーバーでの認証に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSyncはすでに存在するディレクトリを作成しようとしました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSyncの未指定のエラーです。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>前にエラーが発生したため、対象アイテムは同期されていません:</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation>同期の際にシンボリックリンクはサポートしていません。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation>対象ファイルは無視した一覧に登録しています</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <source>File contains invalid characters that can not be synced cross platform.</source>
- <translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation>同期ジャーナルの初期化ができません。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation>CSyncはネットワークへの接続に失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期ディレクトリに読み書きの権限があるか確認してください。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSyncはジャーナルファイルの書き込みに失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>ネットワーク接続のタイムアウトが発生しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>HTTPの伝送エラーが発生しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation>CSync はアクセスに失敗しました</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>ユーザーによって中止されました</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>内部エラー番号 %1 が発生しました。</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルが削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルがダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 の名前が %2 に変更され、他 %3 個のファイルの名前が変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 が %2 に移され、他 %3 個のファイルが移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>この同期により、ローカルの同期フォルダー '%1'にある全ファイルが削除されます。
あなた、または管理者がサーバー上のアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -820,12 +641,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>パスワードを入力してください</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>ユーザー '%2' の %1 パスワードを入力してください:</translation>
</message>
@@ -948,12 +769,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>ファイル '%1'<br/>を書き込み用で開けませんでした。<br/><br/>ログ出力を<b>保存できません</b>でした！</nobr></translation>
</message>
@@ -1837,6 +1658,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index e3ff3d8..24a23b2 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Opmerking:</b> Sommige mappen, waaronder netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Hervatten</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Bevestig het verwijderen van de map</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Weet u zeker dat u de synchronisatie van de map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal de bestanden niet van uw computer verwijderen.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Bevestig map reset</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Wilt u de map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 van %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) van %2 serverruimte in gebruik.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Geen verbinding naar %1 op <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbonden met <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 van %2, bestand %3 van %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbonden met <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Succes.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync kon geen lock file maken.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync kon geen geheugen reserveren.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync fatale parameter fout.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSync verwerkingsstap bijwerken mislukt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync verwerkingsstap verzamelen mislukt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>CSync verwerkingsstap doorzetten mislukt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync ongedefinieerde fout.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync kon het journal bestand niet wegschrijven.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>verbindingstime-out</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Er trad een HTTP transmissiefout plaats.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation>CSync kreeg geen toegang</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Afgebroken door de gebruiker</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Een interne fout met nummer %1 is opgetreden.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 en %2 andere bestanden zijn bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 is hernoemd naar %2 en %3 andere bestanden zijn ook hernoemd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 is verplaatst naar %2 en %3 andere bestanden zijn ook verplaatst.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap '%1'.
Als u of uw beheerder uw account op de server heeft gereset, kies dan "Bewaar bestanden". Als u uw bestanden wilt verwijderen, kies dan "Verwijder alle bestanden".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -819,12 +640,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Vul het wachtwoord in</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Bestand '%1'<br/>kan niet worden geopend voor schrijven.<br/><br/>De logging output kan <b>niet</b> worden weggeschreven!</nobr></translation>
</message>
@@ -1838,6 +1659,185 @@ Probeer opnieuw te synchroniseren.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index f0d471a..8f5d062 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Wstrzymaj</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Uwaga:</b> Niektóre foldery, włączając podłączone w sieci lub współdzielone mogą mieć różne limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Wznów</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Potwierdź usunięcie katalogu</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Czy naprawdę chcesz przerwać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> Ta czynność nie usunie plików z klienta.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Potwierdź reset folderu </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 przestrzeni na serwerze w użyciu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Brak połączenia do %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Podłączony do <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 z %2, plik %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Podłączony do <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Sukces.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync nie mógł utworzyć pliku blokady.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <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="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Krytyczny błąd parametru CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Nieokreślony błąd CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Produkt nie jest zsynchronizowany z powodu wcześniejszych błędów:</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <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="280"/>
- <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="283"/>
- <source>File contains invalid characters that can not be synced cross platform.</source>
- <translation>Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation>Nie można zainicjować synchronizacji dziennika.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync nie powiodło się załadowanie lub utworzenie pliku dziennika. Upewnij się, że masz prawa do odczytu i zapisu do lokalnego katalogu synchronizacji.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync nie udało się zapisać pliku dziennika.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Upłynął limit czasu połączenia.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Wystąpił błąd transmisji HTTP.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation>Synchronizacja nieudana z powodu braku dostępu</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Anulowane przez użytkownika</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Wystąpił błąd wewnętrzny numer %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 inne pliki zostały usunięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 pozostałe pliki zostały ściągnięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 inne pliki zostały zaktualizowane.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 zmienił nazwę na %2 i %3 inne pliki mają zmienione nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 został zmieniony na %2 i %3 inne pliku zostały przeniesione.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
Jeśli Ty lub Twój administrator zresetowali Twoje konto na serwerze, wybierz "Zachowaj pliki". Jeśli chcesz aby Twoje dane zostały usunięte, wybierz "Usuń wszystkie pliki".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -819,12 +640,12 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Wprowadź hasło</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Proszę podać %1 hasło dla użytkownika '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Plik '%1'<br>nie może zostać otwarty do zapisu.<br/><br/>Dane wyjściowe dziennika <b>nie</b> mogą być zapisane!</nobr></translation>
</message>
@@ -1838,6 +1659,185 @@ Niezalecane jest jego użycie.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 54eebe2..6f09b75 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Confirme a remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>A sincronização está a decorrer</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,186 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Sucesso</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync falhou a criação do ficheiro de lock.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <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="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Parametro errado, CSync falhou</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync: Processo de reconciliação falhou.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync: erro não especificado</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <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="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Ocorreu o erro interno %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -460,96 +280,96 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -817,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Introduza a Palavra-passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -943,12 +763,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>O ficheiro '%1'<br/>não pode ser aberto para escrita.<br/><br/>O ficheiro de registo <b>not</b> pode ser guardado!</nobr></translation>
</message>
@@ -1829,6 +1649,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index e5ef979..d52a395 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Nota:</b> Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Confirma remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Você realmente deseja parar de sincronizar a pasta <i>%1</i>?</p><p><b>Nota:</b> Isso não vai remover os arquivos de seu cliente.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Confirme Reiniciar Pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar o tráfego de dados significativo e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 do espaço em uso no servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nenhuma conexão para %1 em <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Sem %1 conexão configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Sincronização acontecendo</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado à <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, file %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente, não há informações de uso de armazenamento disponível.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Sucesso.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>Falha ao criar o arquivo de trava pelo CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync falhou ao reservar memória.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Erro fatal permanente do CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Erro não especificado no CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Csync falhou ao carregar ou criar o arquivo jornal. Certifique-se de ter permissão de escrita no diretório de sincronização local.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>Csync falhou ao tentar gravar o arquivo jornal.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>Falha no acesso CSync</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Abortado pelo usuário</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Um erro interno número %1 ocorreu.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram removidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram baixados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros arquivos foram atualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros três arquivos foram renomeados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros arquivos foram movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os arquivos na pasta de sincronização local '%1'.
Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha "Manter arquivos". Se você deseja que seus dados sejam removidos, escolha "Remover todos os arquivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -820,12 +641,12 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Entrar Senha</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor entrar %1 senha para o usuário '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Arquivo '%1'<br/>não pode ser aberto para escrita.<br/><br/>A saída de log <b>não</b> pode ser salva!</nobr></translation>
</message>
@@ -1836,6 +1657,185 @@ Tente sincronizar novamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index a1aa295..e7c55e4 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Заметьте:</b> Некоторые папки, включая сетевые или общие, могут иметь разные ограничения.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Продолжить</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Подтвердите удаление папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Вы действительно хотите прекратить синхронизацию папки <i>%1</i>?</p><p><b>Примечание:</b> Это действие не удалит файлы с клиента.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Подтвердить сброс папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Соединились с <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Подключён к <a href="%1">%2</a> как <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Успешно.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync не удалось создать файл блокировки.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation>CSync не удалось обнаружить тип файловой системы.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation>CSync получил сообщение об ошибке при обработке внутренних деревьев.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync не удалось зарезервировать память.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Фатальная ошибка параметра CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>Процесс обновления CSync не удался.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>Процесс согласования CSync не удался.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>Процесс передачи CSync не удался.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <source>The local filesystem can not be written. Please check permissions.</source>
- <translation>Локальная файловая система не доступна для записи. Пожалуйста, проверьте права пользователя.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation>CSync не удалось подключиться через прокси.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation>CSync не удалось авторизоваться на прокси сервере.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation>CSync не удалось найти прокси сервер.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation>CSync не удалось аутентифицироваться на сервере %1.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync упал в связи с отутствием обработки из-за отказа в доступе.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync пытался создать директорию, которая уже существует.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation>CSync: Нет доступного пространства на сервере %1 server.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation>Неизвестная ошибка CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Путь не синхронизируется из-за произошедших ошибок:</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation>Синхронизация символических ссылок не поддерживается.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation>Файл присутствует в списке игнорируемых.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <source>File contains invalid characters that can not be synced cross platform.</source>
- <translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation>Не удалось инициализировать журнал синхронизации.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation>CSync не удалось подключиться к сети.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync не смог загрузить или создать файл журнала. Убедитесь что вы имеете права чтения и записи в локальной директории.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync не смог записать файл журнала.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Произошёл таймаут соединения сети.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Произошла ошибка передачи http.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation>CSync не имеет доступа</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Прервано пользователем</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Произошла внутренняя ошибка номер %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Это действие может удалить все файлы в локальной папке '%1'.
Если вы или ваш администратор заново создали вашу учётную запись на сервере, выберите "Сохранить файлы". Если вы хотите стереть всё - выберите "Удалить все файлы".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -819,12 +640,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Введите пароль</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Пожалуйста введите пароль от %1 для пользователя '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Файл '%1'<br/>не может быть открыт на запись.<br/><br/>Журнал <b>не может</b> быть сохранён!</nobr></translation>
</message>
@@ -1838,6 +1659,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index f8a7c43..5d5b964 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Pauza</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Poznámka:<b> Niektoré priečinky, zahŕňajúc sieťové alebo zdieľané, môžu mať odlišné limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Obnovenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdiť odstránenie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Určite chcete zastaviť synchronizáciu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto neodstráni súbory z vášho klienta.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdiť resetovanie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Nenastavený žiaden účet.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Pripojené k <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 z %2, súbor %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Pripojené k <a href="%1">%2</a> ako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Úspech.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>Vytvorenie "zamykacieho" súboru cez "CSync" zlyhalo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync sa nepodarilo zarezervovať pamäť.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync kritická chyba parametrov.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync sa nepodarilo spracovať krok zladenia.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync nešpecifikovaná chyba.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Chyba HTTP prenosu.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation>CSync nepodaril prístup</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Zrušené používateľom</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Vyskytla sa interná chyba číslo %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Táto synchronizácia odstráni všetky súbory v lokálnom synchronizačnom priečinku '%1'.
Pokiaľ vy alebo váš správca zresetoval váš účet na serveri, vyberte možnosť "Ponechať súbory". Pokiaľ chcete odstrániť vaše dáta, vyberte možnosť "Odstrániť všetky súbory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -819,12 +640,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Vložte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation>
</message>
@@ -947,12 +768,12 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Súbor '%1'<br/>nesmie byť otvorený pre proces úprav.</br/><br/>Systémový záznam (log) <b>nemôže</b> byť uložený!</nobr></translation>
</message>
@@ -1834,6 +1655,185 @@ Nie je vhodné ju používať.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 99a1a2e..535d8b8 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Premor</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Opomba:</b> nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Nadaljuj</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Potrdi odstranitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem mape iz odjemalca ne bodo odstranjene.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Potrdi ponastavitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ni povezave z %1 pri <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljenih %1 povezav.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 od %2, datoteka %3 od %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Uspešno vzpostavljeno.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>Ustvarjanje datoteke zaklepa s CSync je spodletelo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <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="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>Usodna napaka parametra CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>Korak opravila posodobitve CSync je spodletel.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>Korak opravila poravnave CSync je spodletel.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>Nedoločena napaka CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <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="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana posebna dovoljenja krajevne mape za usklajevanje.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>Zapisovanje dnevniške datoteke s CSync je spodletelo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Poskus vzpostavitve povezave je časovno potekel.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>Dostop s CSync je spodletel</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Prišlo je do notranje napake s številko %1.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Z usklajevanjem bodo odstranjene vse krajevne datoteke v mapi '%1'.
Če je bil račun na strežniku kakorkoli ponastavljen, izberite možnost "Ohrani datoteke", če pa želite datoteke res odstraniti, izberite drugo možnost.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -819,12 +640,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Vnos gesla</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation>
</message>
@@ -947,12 +768,12 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Datoteke '%1'<br/>ni mogoče odpreti za pisanje.<br/><br/>Dnevniškega zapisa <b>ni mogoče</b> shraniti!</nobr></translation>
</message>
@@ -1838,6 +1659,185 @@ Te je treba uskladiti znova.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index ed5e11d..3bc7d3c 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Notera:</b> Vissa mappar, inklusive nätverksmonterade eller delade mappar, kan ha olika begränsningar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Återuppta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Bekräfta radering av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Vill du verkligen stoppa synkroniseringen av mappen <i>%1</i>?</p><p><b>Notera:</b> Detta kommer inte att radera filerna från din klient.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Bekräfta återställning av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ansluten till <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 av %2, fil %3 av %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Lyckades.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync misslyckades med att skapa en låsfil.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync misslyckades att reservera minne.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync fatal parameter fel.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSync processteg update misslyckades.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync processteg reconcile misslyckades.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>CSync processteg propagate misslyckades.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync ospecificerat fel.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <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="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Ett anslutningsfel mot nätverket uppstod.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Ett HTTP överföringsfel inträffade.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Avbruten av användare</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Internt fel nummer %1 uppstod.</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Denna synk skulle radera alla filer i den lokala mappen '%1'.
Om systemadministratören har återställt ditt konto på servern, välj "Behåll filer". Om du vill att dina filer ska raderas, välj "Radera alla filer".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -819,12 +640,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -947,12 +768,12 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Filen '%1'<br/>kan inte öppnas för skrivning.<br/><br/>Loggtexten kan <b>inte</b> sparas!</nobr></translation>
</message>
@@ -1833,6 +1654,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index baa3593..12c613e 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>หยุดชั่วคราว</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>ดำเนินการต่อ</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>ยืนยันการลบโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>เสร็จสิ้น</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync ล้มเหลวในการสร้างไฟล์ล็อคข้อมูล</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation>CSync ไม่สามารถตรวจพบประเภทของไฟล์ในระบบได้</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation>CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>การจัดสรรหน่วยความจำ CSync ล้มเหลว</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>การปรับปรุงขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>การถ่ายทอดขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <source>The local filesystem can not be written. Please check permissions.</source>
- <translation>ระบบไฟล์ในพื้นที่ไม่สามารถเขียนข้อมูลได้ กรุณาตรวจสอบสิทธิ์การเข้าใช้งาน</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation>CSync ล้มเหลวในการเชื่อมต่อผ่านทางพร็อกซี่</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation>CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation>CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation>CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation>CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>หมดเวลาการเชื่อมต่อเครือข่าย</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>เกิดข้อผิดพลาดภายในระบบหมายเลข %1</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,96 +280,96 @@
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -816,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -942,12 +763,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>ไฟล์ '%1'<br/>ไม่สามารถเปิดขึ้นมาเพื่อเขียนข้อมูลได้.<br/><br/>บันทึกผลลัพธ์ <b>ไม่สามารถ</b> บันทึกข้อมูลได้!</nobr></translation>
</message>
@@ -1828,6 +1649,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 9f271fa..dabb499 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Відновлення</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Підтвердіть видалення каталогу</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Успішно.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync не вдалося створити файл блокування.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation>CSync не вдалося визначити тип файлової системи.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation>У CSync виникла помилка під час сканування внутрішньої структури каталогів.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync не вдалося зарезервувати пам'ять.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>У CSync сталася фатальна помилка параметра.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSync не вдалася зробити оновлення .</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync не вдалася зробити врегулювання.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>CSync не вдалася зробити розповсюдження.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <source>The local filesystem can not be written. Please check permissions.</source>
- <translation>Не можливо проводити запис у локальну файлову систему. Будь ласка, перевірте повноваження.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation>CSync не вдалося приєднатися через Проксі.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation>CSync не вдалося знайти Проксі або Сервер.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation>CSync не вдалося аутентифікуватися на %1 сервері.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync завершився неуспішно через порушення прав доступу.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync намагалася створити каталог, який вже існує.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation>CSync: на сервері %1 скінчилося місце.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation>Невизначена помилка CSync.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation>CSync не вдалося приєднатися до мережі.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>Час під'єднання до мережі вичерпався.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>Сталася помилка передачі даних по HTTP.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Виникла внутрішня помилка за номером %1 .</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,96 +280,96 @@
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -816,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -942,12 +763,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Помилка</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Файл '%1'<br/>не вдається відкрити на запис.<br/><br/>Журнал <b>не</b> можливо зберегти!</nobr></translation>
</message>
@@ -1828,6 +1649,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 4e543c7..ff39ff1 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>暂停</translation>
</message>
@@ -119,59 +119,59 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>继续</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>确认移除文件夹</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>同步正在运行</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>正在执行同步。<br />您确定要关闭它吗？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 of %2, file %3 of %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>成功。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync 无法创建文件锁。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation>CSync 无法检测文件系统类型。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation>CSync 在处理内部文件树时出错。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync 失败，内存不足。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync 致命参数错误。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSync 处理步骤更新失败。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync 处理步骤调和失败。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>CSync 处理步骤传播失败。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <source>The local filesystem can not be written. Please check permissions.</source>
- <translation>本地文件系统不可写。请检查权限。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation>CSync 未能通过代理连接。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation>CSync 无法查询代理或服务器。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation>CSync 于 %1 服务器认证失败。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>出于未处理的权限拒绝，CSync 失败。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync 尝试创建了已有的文件夹。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation>CSync：%1 服务器空间已满。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync 未定义错误。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation>CSync 联网失败。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>Csync同步失败，请确定是否有本地同步目录的读写权</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync写日志文件失败</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>网络连接超时。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>HTTP 传输错误。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>发生内部错误 %1</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,96 +280,96 @@
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -816,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -942,12 +763,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>文件 '%1'<br/>不能写入。<br/><br/>将<b>不</b>能保存日志输出！</nobr></translation>
</message>
@@ -1828,6 +1649,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 269b294..c56c834 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>暫停</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>注意:</b> 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>繼續</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>確認移除資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>您確定要停止同步資料夾<i>%1</i>?</p><p><b>注意:</b> 這不會從您的裝置移除檔案。</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>資料夾重設確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>無%1連線設定</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>同步中</translation>
</message>
@@ -181,27 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>正在同步中<br/>你真的想要中斷？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>成功。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSync 無法建立文件鎖</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <source>CSync could not detect the filesystem type.</source>
- <translation>CSync 無法偵測檔案系統的類型</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="111"/>
- <source>CSync got an error while processing internal trees.</source>
- <translation>CSync 處理內部資料樹時發生錯誤</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync 無法取得記憶體空間。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync 參數錯誤。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <source>CSync processing step update failed.</source>
- <translation>CSync 處理步驟 "update" 失敗。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="123"/>
- <source>CSync processing step reconcile failed.</source>
- <translation>CSync 處理步驟 "reconcile" 失敗。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="126"/>
- <source>CSync processing step propagate failed.</source>
- <translation>CSync 處理步驟 "propagate" 失敗。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="129"/>
- <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="133"/>
- <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="137"/>
- <source>The local filesystem can not be written. Please check permissions.</source>
- <translation>本地檔案系統無法寫入，請確認權限。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="140"/>
- <source>CSync failed to connect through a proxy.</source>
- <translation>CSync 透過代理伺服器連線失敗。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="143"/>
- <source>CSync could not authenticate at the proxy.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="146"/>
- <source>CSync failed to lookup proxy or server.</source>
- <translation>CSync 查詢代理伺服器或伺服器失敗。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="149"/>
- <source>CSync failed to authenticate at the %1 server.</source>
- <translation>CSync 於伺服器 %1 認證失敗。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="161"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync 失敗，由於未處理的存取被拒。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="167"/>
- <source>CSync tried to create a directory that already exists.</source>
- <translation>CSync 試圖建立一個已經存在的目錄。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <source>CSync: No space on %1 server available.</source>
- <translation>CSync：伺服器 %1 沒有可用空間。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync 未知的錯誤。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="277"/>
- <source>Symbolic links are not supported in syncing.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="280"/>
- <source>File is listed on the ignore list.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <source>Unable to initialize a sync journal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="152"/>
- <source>CSync failed to connect to the network.</source>
- <translation>CSync 無法連接到網路。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="93"/>
- <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="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <source>A network connection timeout happend.</source>
- <translation>網路連線逾時。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="158"/>
- <source>A HTTP transmission error happened.</source>
- <translation>HTTP 傳輸錯誤。</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="164"/>
- <source>CSync failed to access </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>發生內部錯誤，錯誤編號 %1</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,96 +280,96 @@
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -816,12 +637,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -942,12 +763,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>檔案 '%1'<br/>無法開啟與寫入<br/><br/>記錄 <b>無法</b> 被儲存</nobr></translation>
</message>
@@ -1828,6 +1649,185 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 8debce9..e9d1a83 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="138"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="137"/>
<source>Pause</source>
<translation>Beklet</translation>
</message>
@@ -119,59 +119,59 @@
<translation><b>Not:</b> Ağa bağlanmış veya paylaşılan klasörler gibi klasörler, farklı sınırlara sahip olabilirler.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="140"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="139"/>
<source>Resume</source>
<translation>Devam et</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="291"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="290"/>
<source>Confirm Folder Remove</source>
<translation>Klasör Kaldırma İşlemini Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="292"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will not remove the files from your client.</p></source>
<translation><p>Gerçekten <i>%1</i> klasörünü eşitlemeyi durdurmak istiyor musunuz?</p><p><b>Not:</b> Bu işlem dosyaları istemcinizden kaldırmayacaktır.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="328"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="327"/>
<source>Confirm Folder Reset</source>
<translation>Klasör Sıfırlamayı Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="329"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacaktır, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="582"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="586"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="585"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="681"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="680"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>Sunucu alanının %1 / %2 (%%3) kısmı kullanımda.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="720"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="719"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>%1 bağlantısı <a href="%2">%3</a> üzerinde yok.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="727"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="726"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="432"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="431"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
@@ -181,27 +181,27 @@
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="433"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="713"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="712"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> ile bağlı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="595"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="594"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1/%2, %3/%4 dosya</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="716"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="715"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation><a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="685"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="684"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
@@ -230,185 +230,6 @@
</message>
</context>
<context>
- <name>Mirall::CSyncThread</name>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="87"/>
- <source>Success.</source>
- <translation>Başarılı.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="90"/>
- <source>CSync failed to create a lock file.</source>
- <translation>CSynk arkiv kapi yampadi. </translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="100"/>
- <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="103"/>
- <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="108"/>
- <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="111"/>
- <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="114"/>
- <source>CSync failed to reserve memory.</source>
- <translation>CSync bellek ayıramadı.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="117"/>
- <source>CSync fatal parameter error.</source>
- <translation>CSync ölümcül parametre hatası</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="120"/>
- <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="123"/>
- <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="126"/>
- <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="129"/>
- <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="133"/>
- <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="137"/>
- <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="140"/>
- <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="143"/>
- <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="146"/>
- <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="149"/>
- <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="161"/>
- <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="167"/>
- <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="170"/>
- <location filename="../src/mirall/csyncthread.cpp" line="173"/>
- <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="176"/>
- <source>CSync unspecified error.</source>
- <translation>CSync belirtilmemiş hata.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="242"/>
- <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="277"/>
- <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="280"/>
- <source>File is listed on the ignore list.</source>
- <translation>Dosya yoksayma listesinde.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="283"/>
- <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="441"/>
- <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="152"/>
- <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="93"/>
- <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation>CSync, günlük dosyası yükleyemedi veya oluşturamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="97"/>
- <source>CSync failed to write the journal file.</source>
- <translation>CSync günlük dosyasına yazamadı.</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="155"/>
- <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="158"/>
- <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="164"/>
- <source>CSync failed to access </source>
- <translation>CSync erişemedi</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="179"/>
- <source>Aborted by the user</source>
- <translation>Kullanıcı tarafından iptal edildi</translation>
- </message>
- <message>
- <location filename="../src/mirall/csyncthread.cpp" line="183"/>
- <source>An internal error number %1 happend.</source>
- <translation>Hata iceri numarali %</translation>
- </message>
-</context>
-<context>
<name>Mirall::ConnectionValidator</name>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
@@ -459,80 +280,80 @@
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="313"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="400"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="402"/>
+ <location filename="../src/mirall/folder.cpp" line="401"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="407"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="408"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="414"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ve diğer %2 dosya güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="415"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="421"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1, %2 olarak ve diğer %3 dosya adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="428"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1, %2 konumuna ve diğer %3 dosya taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Bu eşitleme, yerel eşitleme klasörü '%1' içindeki tüm dosyaları kaldıracak.
Eğer siz veya yöneticiniz sunucudaki hesabınızı sıfırlamışsa, "Dosyaları koru" seçin. Eğer verinizin kaldırılmasını istiyorsanız, "Tüm dosyaları kaldır" seçin.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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>
@@ -541,17 +362,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="703"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -819,12 +640,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="274"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="273"/>
<source>Enter Password</source>
<translation>Parolayı Girin</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="275"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation>
</message>
@@ -947,12 +768,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="140"/>
+ <location filename="../src/mirall/logger.cpp" line="155"/>
<source>Error</source>
<translation>Hata</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="141"/>
+ <location filename="../src/mirall/logger.cpp" line="156"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr> Dosya %1 <br/> acmak mumkun degil yazmak icin. <br/><br/>. Dosya acik bellemek mumkun degil </nobr>. </translation>
</message>
@@ -1837,6 +1658,185 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
</message>
</context>
<context>
+ <name>Mirall::SyncEngine</name>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="87"/>
+ <source>Success.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="90"/>
+ <source>CSync failed to create a lock file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="93"/>
+ <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/syncengine.cpp" line="97"/>
+ <source>CSync failed to write the journal file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="100"/>
+ <source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="103"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="108"/>
+ <source>CSync could not detect the filesystem type.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="111"/>
+ <source>CSync got an error while processing internal trees.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="114"/>
+ <source>CSync failed to reserve memory.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="117"/>
+ <source>CSync fatal parameter error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="120"/>
+ <source>CSync processing step update failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="123"/>
+ <source>CSync processing step reconcile failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="126"/>
+ <source>CSync processing step propagate failed.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="129"/>
+ <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/syncengine.cpp" line="133"/>
+ <source>A remote file can not be written. Please check the remote access.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="137"/>
+ <source>The local filesystem can not be written. Please check permissions.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="140"/>
+ <source>CSync failed to connect through a proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="143"/>
+ <source>CSync could not authenticate at the proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="146"/>
+ <source>CSync failed to lookup proxy or server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="149"/>
+ <source>CSync failed to authenticate at the %1 server.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="152"/>
+ <source>CSync failed to connect to the network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="155"/>
+ <source>A network connection timeout happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="158"/>
+ <source>A HTTP transmission error happened.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="161"/>
+ <source>CSync failed due to not handled permission deniend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="164"/>
+ <source>CSync failed to access </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="167"/>
+ <source>CSync tried to create a directory that already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="170"/>
+ <location filename="../src/mirall/syncengine.cpp" line="173"/>
+ <source>CSync: No space on %1 server available.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="176"/>
+ <source>CSync unspecified error.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="179"/>
+ <source>Aborted by the user</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="183"/>
+ <source>An internal error number %1 happend.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="242"/>
+ <source>The item is not synced because of previous errors:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <source>File contains invalid characters that can not be synced cross platform.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <source>Unable to initialize a sync journal.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::Systray</name>
<message>
<location filename="../src/mirall/systray.cpp" line="49"/>
--
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