[Pkg-owncloud-commits] [owncloud-client] 148/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:46 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 adb868a63b006005c48270948ff87b6a0a515de1
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Sat Mar 15 01:26:42 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 393 +++++++++++++++++-----------------------
translations/mirall_cs.ts | 393 +++++++++++++++++-----------------------
translations/mirall_de.ts | 393 +++++++++++++++++-----------------------
translations/mirall_el.ts | 393 +++++++++++++++++-----------------------
translations/mirall_en.ts | 375 +++++++++++++++++----------------------
translations/mirall_es.ts | 393 +++++++++++++++++-----------------------
translations/mirall_es_AR.ts | 393 +++++++++++++++++-----------------------
translations/mirall_et.ts | 393 +++++++++++++++++-----------------------
translations/mirall_eu.ts | 389 +++++++++++++++++-----------------------
translations/mirall_fa.ts | 377 +++++++++++++++++----------------------
translations/mirall_fi.ts | 379 +++++++++++++++++----------------------
translations/mirall_fr.ts | 393 +++++++++++++++++-----------------------
translations/mirall_gl.ts | 413 +++++++++++++++++++------------------------
translations/mirall_hu.ts | 383 +++++++++++++++++----------------------
translations/mirall_it.ts | 393 +++++++++++++++++-----------------------
translations/mirall_ja.ts | 393 +++++++++++++++++-----------------------
translations/mirall_nl.ts | 393 +++++++++++++++++-----------------------
translations/mirall_pl.ts | 393 +++++++++++++++++-----------------------
translations/mirall_pt.ts | 391 +++++++++++++++++-----------------------
translations/mirall_pt_BR.ts | 393 +++++++++++++++++-----------------------
translations/mirall_ru.ts | 393 +++++++++++++++++-----------------------
translations/mirall_sk.ts | 393 +++++++++++++++++-----------------------
translations/mirall_sl.ts | 393 +++++++++++++++++-----------------------
translations/mirall_sv.ts | 387 +++++++++++++++++-----------------------
translations/mirall_th.ts | 377 +++++++++++++++++----------------------
translations/mirall_uk.ts | 377 +++++++++++++++++----------------------
translations/mirall_zh_CN.ts | 377 +++++++++++++++++----------------------
translations/mirall_zh_TW.ts | 377 +++++++++++++++++----------------------
translations/pofiles/tr.po | 393 +++++++++++++++++-----------------------
29 files changed, 4786 insertions(+), 6497 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index d9b8ec8..1889ee5 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -124,42 +124,54 @@
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Confirma l'eliminació de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Confirmeu la reinicialització de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>S'està sincronitzant</translation>
</message>
@@ -169,52 +181,27 @@
<translation>No hi ha cap compte configurat</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Comença</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Actualment</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Copletament</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 de %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Completament acabat.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Èxit.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -582,57 +569,57 @@ Esteu segur que voleu executar aquesta operació?</translation>
<translation>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Espera per començar la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>El servidor no està disponible actualment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
@@ -1419,17 +1406,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>L'usuari ha aturat la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1437,7 +1424,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1445,7 +1432,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1461,7 +1448,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1469,17 +1456,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1487,18 +1474,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>El fitxer local ha canviat durant la sincronització, es sincronitzarà quan arribi complet</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>L'usuari ha aturat la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1506,22 +1493,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1549,67 +1536,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Hora</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Fitxer</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Acció</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Mida</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Reintenta la sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia la llista d'activitats al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>S'ha copiat al porta-retalls</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>L'estat de sincronització s'ha copiat al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>No hi ha més espai disponible en el servidor.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1867,119 +1849,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Acrediteu-vos</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>No hi ha fitxers de sincronització configurats</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Cap.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Canvis recents</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Obre la carpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Fitxers gestionats:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Obre carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Obre %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Calculant la quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Estat desconegut</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Arranjament...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Detalls...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Surt %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Acredita...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Surt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Quota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1 de %2 en ús</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>No hi ha elements sincronitzats recentment</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Sincronitzant %1 de %2 (%3 de %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Actualitzat</translation>
</message>
@@ -2251,98 +2236,54 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Baixa</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Puja</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Context</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inactiiu</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Comença</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Acabat</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Per esborrar</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>esborrat</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>S'ha mogut a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>baixant</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>pujant</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inactiu</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>iniciant</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>acabat</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>elimina</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>mou</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>mogut</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 9ab8537..e7ec2ff 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -124,42 +124,54 @@
<translation>Obnovit</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdit odstranění složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdit restartování složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Spuštění</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Aktuálně</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Úplně</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 z %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Úplně dokončeno.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<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>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Úspěch.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Aktivita synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -582,57 +569,57 @@ Opravdu chcete provést tuto akci?</translation>
<translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Vyčkává na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Server je nyní nedostupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
@@ -1421,17 +1408,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
@@ -1439,7 +1426,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Soubor by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation>
</message>
@@ -1447,7 +1434,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -1463,7 +1450,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Soubor by odebrán ze sdílení pouze pro čtení. Soubor byl obnoven.</translation>
</message>
@@ -1471,17 +1458,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
</message>
@@ -1489,18 +1476,18 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Místní soubor byl změněn během synchronizace, bude sesynchronizován, jakmile bude kompletní</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze jje uložena v konfliktním souboru.</translation>
</message>
@@ -1508,22 +1495,22 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze jje uložena v konfliktním souboru.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Lokální soubor byl změněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Rozšíření X-OC-MTime není k dispozici, je vyžadováno ownCloud 5</translation>
</message>
@@ -1551,67 +1538,62 @@ Nedoporučuje se jí používat.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Čas</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Soubor</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Složka</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Akce</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Znovu synchronizovat</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopie</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopírovat záznam aktivity do schránky.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Zkopírováno do schránky</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Stav synchronizace byl zkopírován do schránky.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Na serveru již není k dispozici volné místo.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Nyní nejsou v seznamu ignorovaných žádné soubory kvůli předchozím chybám.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 souborů je na seznamu ignorovaných kvůli předchozím chybovým stavům.
@@ -1873,119 +1855,122 @@ Zkuste provést novou synchronizaci.
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Přihlašte se prosím</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Složka %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Nejsou nastaveny žádné synchronizované složky.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Nic.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Poslední změny</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Otevřít složku %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Spravované složky:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Otevřít složku '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Počítám kvóty...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Neznámý stav</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Nastavení...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Podrobnosti...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Ukončit %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Přihlásit...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Odhlásit</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Kvóta nedostupná</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 v používání</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Žádné položky nebyly nedávno synchronizovány</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Synchronizuji %1 z %2 (%3 z %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
@@ -2257,98 +2242,54 @@ Zkuste provést novou synchronizaci.
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Stáhnout</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Odeslat</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Kontext</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Neaktivní</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Spuštění</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Dokončeno</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Ke smazání</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>smazáno</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Přesunuto do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>stahování</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>odesílání</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>neaktivní</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>spouštění</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>dokončeno</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>smazat</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>přesunout</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>přesunut</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 6f6b652..d99ef52 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -124,43 +124,55 @@
<translation>Fortsetzen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Löschen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Zurücksetzen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
@@ -170,52 +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="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Gegenwärtig</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Vollständig</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 von %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Vollständig abgeschlossen.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
@@ -246,178 +233,178 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Erfolgreich</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Interne Fehlernummer %1 aufgetreten.</translation>
</message>
@@ -539,14 +526,14 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -555,17 +542,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -583,57 +570,57 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Der Server ist momentan nicht erreichbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Setup-Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
@@ -1422,17 +1409,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
@@ -1440,7 +1427,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Eine Datei oder Verzeichnis wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation>
</message>
@@ -1448,7 +1435,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
@@ -1464,7 +1451,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt.</translation>
</message>
@@ -1472,17 +1459,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation>
</message>
@@ -1490,18 +1477,18 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert, synchronisieren Sie nochmals sobald die aktuelle Datei vollständig angekommen ist</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
@@ -1509,22 +1496,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Keine X-OC-MTime Erweiterung vorhanden, owncloud 5 ist erforderlich</translation>
</message>
@@ -1552,67 +1539,62 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Ordner</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Aktion</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Größe</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Synchronisation wiederholen</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>In die Zwischenablage kopiert</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Der Synchronisationsstatus wurde in die Zwischenablage kopiert.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Auf dem Server ist kein Speicherplatz mehr vorhanden.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Aktuell werden keine Dateien, aufgrund vorheriger Fehler, ignoriert.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 Datei(en) werden aufgrund vorheriger Fehler ignoriert.
@@ -1873,119 +1855,122 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Bitte melden Sie sich an</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Ordner %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Keine Sync-Ordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Keine.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Letzte Änderungen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Ordner %1 öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Verwaltete Ordner:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Ordner '%1' öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Berechne Quote...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Unbekannter Status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Details...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Anmeldung...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Abmeldung</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Quote unbekannt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% von %2 benutzt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Keine kürzlich synchronisierten Elemente</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Synchronisiere %1 von %2 (%3 von %4) </translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
@@ -2257,98 +2242,54 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Herunterladen</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Hochladen</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Kontext</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inaktiv</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Abgeschlossen</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Zu löschen</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>gelöscht</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Verschoben nach %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>Herunterladen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>Lade hoch</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>Inaktiv</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>Starte</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>abgeschlossen</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>löschen</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>verschiebe</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>verschoben</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index a61f37c..444a354 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -124,42 +124,54 @@
<translation>Συνέχεια</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Επιβεβαίωση αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Δεν υπάρχει σύνδεση με το %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Ο Συγχρονισμός Εκτελείται</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Έναρξη</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Τώρα</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Ολοκληρωτικά</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 από %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Ολοκληρώθηκε.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Επιτυχία.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Ένα εσωτερικό σφάλμα με αριθμό %1 συνέβη.</translation>
</message>
@@ -538,14 +525,14 @@
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -582,57 +569,57 @@ Are you sure you want to perform this operation?</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμια εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη κατάσταση.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Ο Συγχρονισμός Παύθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμούς)</translation>
</message>
@@ -1421,17 +1408,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1439,7 +1426,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1447,7 +1434,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>αδυναμία δημιουργίας καταλόγου %1</translation>
</message>
@@ -1463,7 +1450,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1471,17 +1458,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε το ξανά Κοινόχρηστος.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1489,18 +1476,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού, θα συγχρονιστεί και πάλι όταν φτάσει πλήρως</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1508,22 +1495,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1551,67 +1538,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Ώρα</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Αρχείο</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Φάκελος</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Ενέργεια</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Μέγεθος</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Επαναλήψη Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Αντιγραφή</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Αντιγραφθηκε στο clipboard</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Η κατάσταση συγχρονισμού αντιγράφηκε στο πρόχειρο.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Δεν υπάρχει πλέον διαθέσιμος αποθηκευτικός χώρος στο διακομιστή. </translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Προς το παρόν κανένα αρχείο δεν θα αγνοηθεί λόγω προηγούμενων σφαλμάτων.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 αρχεία θα ανγοηθούν λόγω προηγούμενων σφαλμάτων.
@@ -1871,119 +1853,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Παρκαλώ συνδεθείτε</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Φάκελος %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Κανένας.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Πρόσφατες Αλλαγές</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Άνοιγμα %1 φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Διαχείριση αρχείων:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Άνοιγμα καταλόγου '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Υπολογισμός μεριδίου χώρου αποθήκευσης...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Άγνωστη κατάσταση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Ρυθμίσεις...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Λεπτομέρειες...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Βοήθεια</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Κλείσιμο %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Σύνδεση...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Μερίδιο χώρου αποθήκευσης δεν είναι διαθέσιμο</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Συγχρονισμός %1 από %2 (%3 από %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
@@ -2277,98 +2262,54 @@ Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Λήψη</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Μεταφόρτωση</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Πλαίσιο</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Ανενεργό</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Έναρξη</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Ολοκλήρωση</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Προς διαγραφή</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>διαγράφηκε</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Μετακινήθηκαν στο %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>λήψη</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>μεταφόρτωση</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>ανενεργό</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>έναρξη</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>ολοκληρώθηκε</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>διαγραφή</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>μετακινήστε</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>μετακινήθηκαν</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index fa96143..1caab16 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -126,42 +126,54 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <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"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
@@ -171,52 +183,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="605"/>
- <source>Start</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
@@ -247,178 +234,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation type="unfinished"></translation>
</message>
@@ -540,30 +527,30 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -581,57 +568,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -1416,17 +1403,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
@@ -1434,7 +1421,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1442,7 +1429,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1458,7 +1445,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1466,17 +1453,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1484,18 +1471,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
@@ -1503,22 +1490,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"></translation>
</message>
@@ -1546,67 +1533,62 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"></translation>
@@ -1864,119 +1846,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation type="unfinished"></translation>
</message>
@@ -2248,97 +2233,53 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
+ <source>Uploaded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 3104889..3516015 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -124,42 +124,54 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar la eliminación de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Confirme que desea restablecer la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<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="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
@@ -169,52 +181,27 @@
<translation>No se ha configurado la cuenta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Actualmente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Completamente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 de %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Finalizado</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -582,57 +569,57 @@ Está seguro de que desea realizar esta operación?</translation>
<translation>Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Esperando el inicio de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>El servidor no está disponible en el momento</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronización fue exitosa pero con advertencias para archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -1421,17 +1408,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>La sincronización ha sido Interrumpida por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
@@ -1439,7 +1426,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un archivo o directorio fue eliminado de una carpeta compartida en modo de solo lectura, pero la recuperación falló: %1</translation>
</message>
@@ -1447,7 +1434,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>No se pudo crear el directorio %1</translation>
</message>
@@ -1463,7 +1450,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>El archvo fue eliminado de una carpeta compartida en modo de solo lectura. Ha sido recuperado.</translation>
</message>
@@ -1471,17 +1458,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado.</translation>
</message>
@@ -1489,18 +1476,18 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Fichero local modificado mientras se sincronizaba, sincronice otra vez cuando termine de editar</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>La sincronización ha sido Interrumpida por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
@@ -1508,22 +1495,22 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>No hay una extensión X-OC-MTime, se requiere ownCloud 5</translation>
</message>
@@ -1551,67 +1538,62 @@ No se recomienda usarlo.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Hora</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Archivo</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Acción</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Reintentar Sincronizar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copie la lista de actividades al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>El informe de sincronización fue copiado al portapapeles.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>No hay más espacio disponible en el servidor.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Actualmente no hay ficheros ignorados por errores previos.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>1% de los archivos fueron ignorados debido a errores previos.
@@ -1872,119 +1854,122 @@ Intente sincronizar los archivos nuevamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Por favor Registrese</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>No hay carpetas de sincronización configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Ninguno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Abrir carpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Carpetas administradas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Calculando cuota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Salir de %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Registrarse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Cuota no disponible</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -2256,98 +2241,54 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Descargar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Subir</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Contexto</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inactivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Terminado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Para eliminación</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>borrado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>subiendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inactivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>iniciando</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>finalizado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>eliminar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>mover</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 210ec15..9e09252 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -124,42 +124,54 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Confirmá la eliminación del directorio</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Confirme el reseteo de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<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="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
@@ -169,52 +181,27 @@
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Inicio</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Actualmente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Completamente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 de %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Completamente terminado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Éxito.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -582,57 +569,57 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Esperando el comienzo de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>El servidor actualmente no está disponible.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -1419,17 +1406,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizaciójn abortada por el usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1437,7 +1424,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1445,7 +1432,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1461,7 +1448,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1469,17 +1456,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1487,18 +1474,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Los archivos locales han cambiado durante la sincronización, la primera vez ha funcionado completamente</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizaciójn abortada por el usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1506,22 +1493,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1549,67 +1536,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Hora</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Archivo</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Acción</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Volver a intentar el Sync</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar la lista de actividades al portapapeles.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>El estado de sincronización ha sido copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>No hay más espacio disponible en el servidor.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Actualmente ningún archivo es ignorado por errores previos.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 archivos fueron ignorados por errores previos.
@@ -1868,119 +1850,122 @@ Intente sincronizar estos nuevamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Por favor, inicie sesión</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Directorio %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Los directorios de sincronización no están configurados.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Ninguno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Abrir directorio %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Directorios administrados:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Calculando cuota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Cancelar %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Iniciando sesión...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Cuota no disponible</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>No se sincronizaron elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>actualizado</translation>
</message>
@@ -2253,98 +2238,54 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Descargar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Subir</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Contexto</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inactivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Inicio</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Terminado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Para borrado</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>borrado</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>subiendo</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inactivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>iniciando</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>finalizado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>borrar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>mover</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 445a6e0..673dc86 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -124,42 +124,54 @@
<translation>Taasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Kinnita kausta eemaldamist</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Kinnita kataloogi algseadistus</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Hetkel</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Täielikult</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 / %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Täielikult lõpetatud.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Korras.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Tekkis sisemine viga number %1.</translation>
</message>
@@ -538,14 +525,14 @@
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -582,57 +569,57 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Ootab sünkroniseerimise alustamist.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Server pole hetkel saadaval.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
@@ -1421,17 +1408,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
@@ -1439,7 +1426,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1447,7 +1434,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>ei suuda luua kataloogi %1</translation>
</message>
@@ -1463,7 +1450,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1471,17 +1458,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1489,18 +1476,18 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Kohalik fail muutus sünkroniseerimise ajal, sünkroniseerin kuni ülekanne on täielik</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1508,22 +1495,22 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1551,67 +1538,62 @@ Selle kasutamine pole soovitatav.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Aeg</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Fail</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Kaust</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Suurus</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Proovi uuesti sünkroniseerida</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopeeri</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Kopeeritud lõikepuhvrisse</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Sünkroniseeringu staatus on kopeeritud lõikepuhvrisse.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Serveris pole rohkem vaba ruumi.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Hetkel ei ignoreerita ühtegi faili eelnenud vigade tõttu.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 faili on ignoreeritud eelnenud vigade tõttu.
@@ -1872,119 +1854,122 @@ Proovi neid uuesti sünkroniseerida.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Palun logi sisse</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Kaust %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Pole.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Hiljutised muudatused</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Ava kaust %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Hallatavad kaustad:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Ava kaust '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Ava %1 veebilehitsejas</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Mahupiiri arvutamine...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Tundmatu staatus</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Seaded...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Üksikasjad...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Abiinfo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Lõpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Logi sisse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Logi välja</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Mahupiir n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>Kasutusel %1% / %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Sünkroniseerin %1 / %2 (%3 / %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
@@ -2256,98 +2241,54 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Lae alla</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Lae üles</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Kontekst</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Passiivne</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Lõpetatud</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Kustutamiseks</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>kustutatud</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Tõstetud %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>allalaadimine</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>üleslaadimine</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>passiivne</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>alustamine</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>lõpetatud</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>kustuta</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>tõsta ümber</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>ümber tõstetud</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index a33566c..a6a2115 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -124,42 +124,54 @@
<translation>Berrekin</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Baieztatu karpetaren ezabatzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Baieztatu Karpetaren Leheneratzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Hasi</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Orain</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Guztiz</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Guztiz bukatuta.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Arrakasta.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,30 +525,30 @@
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -579,57 +566,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Zerbitzaria orain ez dago eskuragarri.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Erabiltzaileak Bertan Behera Utzi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
@@ -1416,17 +1403,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1434,7 +1421,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1442,7 +1429,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>Ezin izan da %1 karpeta sortu</translation>
</message>
@@ -1458,7 +1445,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1466,17 +1453,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1484,18 +1471,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1503,22 +1490,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1546,67 +1533,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Noiz</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Fitxategia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Karpeta</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Ekintza</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Tamaina</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Saiatu berriz sinkronizatzen</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiatu</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Arbelera kopiatua</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Sinkronizazio egoera arbelera kopiatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Ez dago biltegiratze leku gehiago zerbitzarian.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Oraintxe ez da fitxategirik baztertzen aurreko erroreak direla eta.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 fitxategi baztertu dira aurreko erroreak direla eta.
@@ -1865,119 +1847,122 @@ Saiatu horiek berriz sinkronizatzen.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Mesedez saioa hasi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Ez dago sinkronizazio karpetarik definituta.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Bat ere ez.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Azkenengo Aldaketak</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Ireki %1 karpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Kudeatutako karpetak:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Ireki '%1' karpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Ireki %1 arakatzailean</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Egoera ezezaguna</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Ezarpenak...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Xehetasunak...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Laguntza</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>%1etik Irten</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Saioa hasi...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Saioa bukatu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%2tik %%1 erabilita</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Ez da azken aldian ezer sinkronizatu</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Eguneratua</translation>
</message>
@@ -2249,98 +2234,54 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Deskargatu</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Igo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <source>Uploaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inaktiboa</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Hasi</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Bukatuta</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Ezabatzeko</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>ezabatuta</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>%1era mugituta</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>deskargatzen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>igotzen</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inaktiboa</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>hasten</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>bukatuta</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>ezabatu</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>mugitu</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>mugituta</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 5b40057..807c71c 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -124,42 +124,54 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>قبول کردن پاک شدن پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
@@ -169,52 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="605"/>
- <source>Start</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>موفقیت</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>یک خطای داخلی به شماره ی %1 اتفاق افتاد.</translation>
</message>
@@ -538,30 +525,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -579,57 +566,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>صبر کنید تا همگام سازی آغاز شود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1414,17 +1401,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1432,7 +1419,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1440,7 +1427,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1456,7 +1443,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1464,17 +1451,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1482,18 +1469,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1501,22 +1488,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1544,67 +1531,62 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>زمان</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>اندازه</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>کپی کردن</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>کپی به کلیپ بورد</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1862,119 +1844,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>پوشه %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>هیچ پوشه ای همگام سازی شدهای تنظیم نشده است</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>بازکردن %1 پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>پوشه های مدیریت شده:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>راهنما</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
@@ -2246,97 +2231,53 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>دانلود</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>بارگزاری</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
+ <source>Uploaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>حذف شده</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>پاک کردن</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 4344686..e1c94f6 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -124,42 +124,54 @@
<translation>Jatka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Vahvista kansion poisto</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4/%5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Kokonaan valmis.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Onnistui.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Tapahtui sisäinen virhe %1.</translation>
</message>
@@ -538,30 +525,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -579,57 +566,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Odottaa synkronoinnin alkamista.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Palvelin ei ole käytettävissä.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
@@ -1415,17 +1402,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1433,7 +1420,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1441,7 +1428,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1457,7 +1444,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1465,17 +1452,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1483,18 +1470,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1502,22 +1489,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1545,67 +1532,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Aika</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Tiedosto</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Kansio</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Toiminto</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Koko</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Yritä uudelleen synkronointia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopioi</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Kopioitu leikepöydälle</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Synkronointitila on kopioitu leikepöydälle.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Palvelimella ei ole enää tallennustilaa käytettävissä.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1863,119 +1845,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Kirjaudu sisään</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Kansio %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Synkronointikansioita ei ole määritetty.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Viimeisimmät muutokset</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Avaa %1-kansio</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Hallitut kansiot:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Avaa kansio '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Avaa %1 selaimeen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Lasketaan kiintiötä...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Tuntematon tila</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Asetukset...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Tiedot...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Ohje</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Lopeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Kirjaudu sisään...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Kirjaudu ulos</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1%/%2 käytössä</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Kohteita ei ole synkronoitu äskettäin</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Synkronoidaan %1/%2 (%3/%4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Ajan tasalla</translation>
</message>
@@ -2247,99 +2232,55 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Lataa</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Lähetä</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <source>Uploaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Valmis</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Poistettavaksi</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>poistettu</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>ladataan</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>lähetetään</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>poista</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>siirretty</translation>
- </message>
</context>
<context>
<name>theme</name>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 1cbd1aa..3f2b598 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -124,42 +124,54 @@
<translation>Reprendre</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Confirmer le retrait du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Confirmation de la réinitialisation du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Démarrer</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Actuellement</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Complètement</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 de %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Complètement terminé.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Succès.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -582,57 +569,57 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Le serveur est indisponible actuellement.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Dernière synchronisation effectuée avec succès</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
@@ -1421,17 +1408,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>La synchronisation a été interrompue par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
@@ -1439,7 +1426,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un fichier ou un dossier a été supprimé du partage en lecture seule, mais la restauration à échoué : %1</translation>
</message>
@@ -1447,7 +1434,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>impossible de créer le répertoire %1</translation>
</message>
@@ -1463,7 +1450,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Le fichier a été supprimé d'un partage en lecture seule. Il a été restauré.</translation>
</message>
@@ -1471,17 +1458,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Ce dossier ne doit pas être renommé. Veuillez le nommer Partagé uniquement.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation>
</message>
@@ -1489,18 +1476,18 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Fichier local modifié pendant la synchronisation, la synchronisation redémarrera lorsque ce sera terminé</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>La synchronisation a été interrompue par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
@@ -1508,22 +1495,22 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Aucune extension X-OC-MTime, ownCloud 5 est exigé</translation>
</message>
@@ -1551,67 +1538,62 @@ Il est déconseillé de l'utiliser.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Heure</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Fichier</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Dossier</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Action</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Taille</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Lancer à nouveau la synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copier la liste d'activités dans le presse papiers.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Copié dans le presse-papiers</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Le statu de synchronisation a été copié dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Plus aucun espace de stockage n'est disponible sur le serveur.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Actuellement aucun fichier n'a été ignoré en raison d'erreurs précédentes.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 fichiers ont été ignorés en raison des erreurs précédentes.
@@ -1872,119 +1854,122 @@ Il est déconseillé de l'utiliser.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Veuillez vous connecter</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Dossier %1 : %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Aucun répertoire synchronisé n'est configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Aucun.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Modifications récentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Ouvrir le répertoire %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Répertoires suivis :</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Ouvrir le dossier '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Calcul du quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Statut inconnu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Paramètres...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Détails...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Quitter %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Se connecter...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Quota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 occupés</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Aucun item synchronisé récemment</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Synchronisation %1 de %2 (%3 de %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
@@ -2256,98 +2241,54 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Télécharger</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Envoyer</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Contexte</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inactif</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Démarrer</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Terminé</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Pour suppression</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>supprimé</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Déplacé vers %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>téléchargement</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>téléversement</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inactif</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>démarrage</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>terminé</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>supprimer</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>déplacer</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>déplacé</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 3ec2849..513e136 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -124,42 +124,54 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar a eliminación do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar o restabelecemento do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Actual</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Completado</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 de %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Totalmente terminada.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<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>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Correcto.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -480,57 +467,57 @@
<location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
- <translation type="unfinished"/>
+ <translation>O ficheiro %1 e outros %2 foron retirados satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="402"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
- <translation type="unfinished"/>
+ <translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
- <translation type="unfinished"/>
+ <translation>O ficheiro %1 e outros %2 foron descargados satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
- <translation type="unfinished"/>
+ <translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 and %2 other files have been updated.</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro %1 e outros %2 foron enviados satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
- <translation type="unfinished"/>
+ <translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="421"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
- <translation type="unfinished"/>
+ <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"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
- <translation type="unfinished"/>
+ <translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
- <translation type="unfinished"/>
+ <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"/>
<source>%1 has been moved to %2.</source>
- <translation type="unfinished"/>
+ <translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message>
<location filename="../src/mirall/folder.cpp" line="438"/>
@@ -538,14 +525,14 @@
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -582,57 +569,57 @@ Confirma que quere realizar esta operación?</translation>
<translation>Atopouse un diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Agardando polo comezo da sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>O servidor non está dispoñíbel actualmente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
@@ -1421,17 +1408,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>A sincronización foi interrompida polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
@@ -1439,7 +1426,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Foi retirado un ficheiro ou directorio desde unha compartición de só lectura, mais non foi posíbel a súa restauración: %1</translation>
</message>
@@ -1447,7 +1434,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>non foi posíbel crear o directorio %1</translation>
</message>
@@ -1463,7 +1450,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Foi retirado un ficheiro desde unha compartición de só lectura. Foi restaurado.</translation>
</message>
@@ -1471,17 +1458,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation>
</message>
@@ -1489,18 +1476,18 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>O ficheiro local cambiou durante a sincronización, sincronizando unha vez quedou completado</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>A sincronización foi interrompida polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
@@ -1508,22 +1495,22 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presentes)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Non existe a extensión X-OC-MTime, require ownCloud 5</translation>
</message>
@@ -1551,67 +1538,62 @@ Recomendámoslle que non o use.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Hora</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Ficheiro</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Acción</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Volver tentar a sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista da actividade no portapapeis.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Copiado no portapapeis.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>O estado de sincronización foi copiado no portapapeis.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Non hai máis espazo de almacenamento dispoñíbel no servidor.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Actualmente non hai ficheiros ignorados por mor de erros anteriores.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 ficheiros foron ignorados por mor de erros anteriores.
@@ -1872,119 +1854,122 @@ Tente sincronizalos de novo.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Ten que rexistrarse</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Cartafol %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Non se configuraron cartafoles de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Nada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Cambios recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Abrir o cartafol %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Cartafoles xestionados:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Abrir o cartafol «%1»</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Calculando a cota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Estado descoñecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Axustes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Axuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Saír de %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Rexistrarse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Saír</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Cota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>Usado %1% de %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Non hai elementos sincronizados recentemente</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -2256,98 +2241,54 @@ Tente sincronizalos de novo.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Descargar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Enviar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Contexto</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inactivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Rematado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Para eliminar</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>eliminado</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Movido a %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>enviando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inactivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>iniciando</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>rematado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>eliminar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>mover</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 70b0ad3..9a7429b 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -124,42 +124,54 @@
<translation>Folytatás</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<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="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Szinkronizálás fut</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Nincs beállított kapcsolat.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="605"/>
- <source>Start</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Teljesen befejezve.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Sikerült.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,30 +525,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<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="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -579,57 +566,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>A kiszolgáló jelenleg nem érhető el.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1414,17 +1401,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1432,7 +1419,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1440,7 +1427,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1456,7 +1443,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1464,17 +1451,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1482,18 +1469,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1501,22 +1488,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1544,67 +1531,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Idő</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Fájl</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Mappa</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Művelet</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Méret</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Másolás</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Bemásolva a vágólapra</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1862,119 +1844,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Belépés szükséges</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Mappa %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Nincsenek megadva szinkronizálandó mappák.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Nincs</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Legutóbbi változások</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>%1 mappa megnyitása</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Kezelt mappák:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Kvóta kiszámítása...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Ismeretlen állapot</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Beállítások...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Részletek...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Súgó</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Belépés...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Kilépés</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Kvóta n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Frissítve</translation>
</message>
@@ -2246,98 +2231,54 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Letöltés</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Feltöltés</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
+ <source>Uploaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Befejezve</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>törölve</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>letöltés folyamatban</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>feltöltés folyamatban</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inaktív</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>indítás folyamatban</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>befejeződött</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>töröl</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>mozgat</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>mozgatva</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index d917f9a..f6bf59a 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -124,42 +124,54 @@
<translation>Riprendi</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Conferma la rimozione della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Conferma il ripristino della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Avvia</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Attualmente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Completamente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 di %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Terminata completamente.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Successo.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -582,57 +569,57 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<translation>È stato trovato un vecchio diario di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Attende l'inizio della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Il server è attualmente non disponibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stato completata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
@@ -1420,17 +1407,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
@@ -1438,7 +1425,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation>
</message>
@@ -1446,7 +1433,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -1462,7 +1449,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Il file è stato rimosso da una condivisione in sola lettura. È stato ripristinato.</translation>
</message>
@@ -1470,17 +1457,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Questa cartella non può essere rinominata. Ripristina il nome Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation>
</message>
@@ -1488,18 +1475,18 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Un file locale è cambiato durante la sincronizzazione, nuova sincronizzazione alla ricezione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
@@ -1507,22 +1494,22 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Nessun e-tag era presente)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Non è presente l'estensione X-OC-MTime, è richiesto ownCloud 5</translation>
</message>
@@ -1550,67 +1537,62 @@ Non è consigliabile utilizzarlo.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Ora</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>File</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Cartella</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Azione</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Dimensione</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Riprova sincronizzazione</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia l'elenco delle attività negli appunti.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Copiato negli appunti</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Lo stato di sincronizzazione è stato copiato negli appunti.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Spazio di archiviazione insufficiente sul server.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Attualmente nessun file è ignorato a causa di errori precedenti.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 file sono ignorati a causa di errori precedenti.
@@ -1871,119 +1853,122 @@ Prova a sincronizzare nuovamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Cartella %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Nessuna cartella configurata per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Nessuna.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Modifiche recenti</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Apri la cartella %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Cartelle gestite:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Apri la cartella '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Calcolo quota in corso...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Stato sconosciuto</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Impostazioni...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Dettagli...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Aiuto</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Esci da %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Accedi...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Quota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% di %2 utilizzati</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Nessun elemento sincronizzato di recente</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Sincronizzazione di %1 di %2 (%3 di %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
@@ -2255,98 +2240,54 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Scarica</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Carica</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Contesto</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inattivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Avvia</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Completato</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Da eliminare</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>eliminati</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Spostato in %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>scaricamento in corso</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>caricamento in corso</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inattivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>avvio in corso</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>completato</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>elimina</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>sposta</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>spostato</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 39c1428..d6b4dfc 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -124,42 +124,54 @@
<translation>再開</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>フォルダーの削除を確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>フォルダーのリセットを確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 使用中のサーバー領域</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
@@ -169,52 +181,27 @@
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>開始</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>現在</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>完全に</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 of %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>完全に終了しました。</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>内部エラー番号 %1 が発生しました。</translation>
</message>
@@ -538,14 +525,14 @@
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -582,57 +569,57 @@ Are you sure you want to perform this operation?</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>サーバーは現在利用できません。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
@@ -1420,17 +1407,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
@@ -1438,7 +1425,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>ファイルまたはディレクトリが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation>
</message>
@@ -1446,7 +1433,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>ディレクトリ %1 を作成できませんでした</translation>
</message>
@@ -1462,7 +1449,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>ファイルが読み込み専用の共有から削除されました。ファイルは復元されました。</translation>
</message>
@@ -1470,17 +1457,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
</message>
@@ -1488,18 +1475,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>同期中にローカルファイルが変更されました。完了してからもう一度同期してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。それは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
@@ -1507,22 +1494,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しませんでした。（e-tag が存在しませんでした）</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>X-OC-MTime 拡張がありません、 ownCloud 5 が必要です。</translation>
</message>
@@ -1550,67 +1537,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>時刻</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>ファイル</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>フォルダー</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>アクション</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>サイズ</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>同期を再実行</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>コピー</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>アクティビティ一覧をコピーする</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>クリップボードにコピー</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>同期状況をクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>サーバー上で利用可能なストレージ領域が足りません。</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>前にエラーが発生したため、無視するファイルはありません</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>以前のエラーが発生したため、%1 のファイルが無視されていました。
@@ -1871,119 +1853,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>サインインしてください</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>フォルダー %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>同期フォルダーが設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>なし</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>最近変更されたファイル</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>%1 フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>管理フォルダー:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>フォルダー ’%1’ を開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>クォータを計算中...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>不明な状態</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>詳細...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>ヘルプ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>サインイン...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>クォータ n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%2 のうち %1% を使用中</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>最近同期されたアイテムはありません。</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>%2 の %1 (%4 分の %3) を同期中</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>最新です</translation>
</message>
@@ -2255,98 +2240,54 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>ダウンロード</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>アップロード</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>コンテキスト</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>無効</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>開始</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>終了</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>削除対象</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>削除</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>%1 へ移動完了</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>ダウンロード中</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>アップロード中</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>無効</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>開始</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>終了</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>削除</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>移動</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>移動</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 40efc01..9ac2bd5 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -124,42 +124,54 @@
<translation>Hervatten</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Bevestig het verwijderen van de map</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Bevestig map reset</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Momenteel</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Volledig</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 van %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Helemaal klaar</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<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>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Succes.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -582,57 +569,57 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>De server is nu niet beschikbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was succesvol.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
@@ -1421,17 +1408,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
@@ -1439,7 +1426,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation>
</message>
@@ -1447,7 +1434,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -1463,7 +1450,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Het bestand is verwijderd van een alleen-lezen share. Het is teruggezet.</translation>
</message>
@@ -1471,17 +1458,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation>
</message>
@@ -1489,18 +1476,18 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Een lokaal bestand is gewijzigd tijdens het synchroniseren, wordt gesynchroniseerd als het volledig is aangekomen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
@@ -1508,22 +1495,22 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Er is geen X-OC-MTime extensie aanwezig, ownCloud 5 is vereist</translation>
</message>
@@ -1551,67 +1538,62 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Tijd</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Bestand</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Map</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Handeling</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Grootte</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Synchroniseer opnieuw</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopieer de activiteitenlijst naar het klembord.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Gekopieerd naar het klembord</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Het synchronisatie overzicht is gekopieerd naar het klembord.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Geen opslagruimte meer beschikbaar op de server.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Er zijn nu geen bestanden genegeerd vanwege eerdere fouten.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 bestanden zijn genegeerd vanwege eerdere fouten.
@@ -1872,119 +1854,122 @@ Probeer opnieuw te synchroniseren.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Log alstublieft in</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Map %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Geen synchronisatie-mappen geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Geen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Recente wijzigingen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Open %1 map</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Beheerde mappen:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Open map '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Quota worden berekend ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Onbekende status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Instellingen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Details ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Help</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>%1 afsluiten</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Inloggen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Uitloggen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Quota niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% van %2 gebruikt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Recent niets gesynchroniseerd</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Synchroniseert %1 van %2 (%3 van %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
@@ -2256,98 +2241,54 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Downloaden</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Uploaden</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Context</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inactief</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Klaar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Voor verwijdering</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>verwijderd</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Verplaatst naar %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>downloaden</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>uploaden</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inactief</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>beginnend</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>klaar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>verwijderen</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>verplaatsen</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>verplaatst</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index fa2ec73..34f70b5 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -124,42 +124,54 @@
<translation>Wznów</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Potwierdź usunięcie katalogu</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Potwierdź reset folderu </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Obecnie</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Całkowicie</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 z %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Całkowicie zakończony.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Sukces.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -582,57 +569,57 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<translation>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Czekają na uruchomienie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Serwer jest obecnie niedostępny.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
@@ -1420,17 +1407,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
@@ -1438,7 +1425,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1446,7 +1433,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>nie można utworzyć katalogu %1</translation>
</message>
@@ -1462,7 +1449,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1470,17 +1457,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1488,18 +1475,18 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Lokalny plik zmienił się podczas synchronizacji, synchronizuję ponownie ponieważ dotarł w całości.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1507,22 +1494,22 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Brak rozszerzenia X-OC-MTime, wymagany ownCloud 5</translation>
</message>
@@ -1550,67 +1537,62 @@ Niezalecane jest jego użycie.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Czas</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Plik</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Folder</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Akcja</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Rozmiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Ponów synchronizację</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiuj listę aktywności do schowka.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Skopiuj do schowka</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Status synchronizacji został skopiowany do schowka.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Brak wolnego miejsca na serwerze.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Obecnie nie ma plików, które są ignorowane z powodu wcześniejszych błędów.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 pliki są ignorowane z powodu błędów.
@@ -1871,119 +1853,122 @@ Niezalecane jest jego użycie.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Proszę się zalogować</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Folder %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Nie skonfigurowano synchronizowanych folderów.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Brak.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Ostatnie zmiany</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Otwórz folder %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Zarządzane foldery:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Otwórz katalog '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Obliczam quote...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Nieznany status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Ustawienia...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Szczegóły...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Wyjdź %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Loguję...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Wyloguj</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Quota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 w użyciu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Brak ostatnich synchronizacji</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Synchronizacja %1 z %2 (%3 z %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
@@ -2256,98 +2241,54 @@ Kliknij</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Pobierz</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Wyślij</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Kontekst</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Nieaktywne</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Zakończony</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Do usunięcia</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>usunięto</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Przeniesione do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>pobieram</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>przesyłanie</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>nieaktywne</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>Uruchamiam</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>zakończony</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>usuń</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>przenieś</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>przeniesione</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index d72d75f..74728ce 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -124,42 +124,54 @@
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Confirme a remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>A sincronização está a decorrer</translation>
</message>
@@ -169,52 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="605"/>
- <source>Start</source>
- <translation>Iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Actualmente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Completamente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 de %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -245,179 +232,179 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Sucesso</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Ocorreu o erro interno %1.</translation>
</message>
@@ -539,30 +526,30 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -580,57 +567,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>A aguardar o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>A sincronização está a correr.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi efectuada com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>A sincronização está em pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1415,17 +1402,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi cancelada pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1433,7 +1420,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1441,7 +1428,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar a directoria %1</translation>
</message>
@@ -1457,7 +1444,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1465,17 +1452,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1483,18 +1470,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi cancelada pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1502,22 +1489,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1545,67 +1532,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Tempo</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Ficheiro</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Pasta</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Acção</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Copiado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1863,119 +1845,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Nenhuma pasta de sincronização configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Alterações recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Abrir a pasta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Pastas Geridas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>A calcular quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Estado desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Entrar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -2247,98 +2232,54 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Transferir</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Carregar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Contexto</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inactivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Acabou</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Para eliminar</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>apagado</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Movido para %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>A descarregar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>A carregar</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>Inactivo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>A iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>Concluído</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>apagar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>mover</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 1893624..0368276 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -124,42 +124,54 @@
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Confirma remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Confirme Reiniciar Pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Sem %1 conexão configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Sincronização acontecendo</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Atualmente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Completamente</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 de %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Completamente finalizado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<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>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -582,57 +569,57 @@ Você tem certeza que quer executar esta operação?</translation>
<translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Aguardando o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Servidor indisponível no momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Erro de configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Usuário Abortou</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
@@ -1419,17 +1406,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi abortada pelo usuário.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
@@ -1437,7 +1424,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Um arquivo ou diretório foi removido de um compartilhamento somente de leitura, mas a restauração falhou: %1</translation>
</message>
@@ -1445,7 +1432,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar diretório %1</translation>
</message>
@@ -1461,7 +1448,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>O arquivo foi removido de um compartilhamento somente de leitura. Ele foi restaurado.</translation>
</message>
@@ -1469,17 +1456,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ele será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado.</translation>
</message>
@@ -1487,18 +1474,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Arquivo local alterado durante a sincronização, sincronizando uma vez que chegou completamente</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi abortada pelo usuário.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
@@ -1506,22 +1493,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último pedaço. (Nenhuma e-etiqueta estava presente)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Sem extensão X-OC-mtime, ownCloud 5 é necessário</translation>
</message>
@@ -1549,67 +1536,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Tempo</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Arquivo</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Pasta</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Ação</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Rafazer Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista de atividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Copiado para área de transferência</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>O estado de sincronização foi copiado para o clipboard.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Não existe mais espaço disponível para armazenamento no servidor.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Correntemente nenhum arquivo será ignorado por causa de erros prévios.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 arquivos são ignorados por causa de erros prévios.
@@ -1870,119 +1852,122 @@ Tente sincronizar novamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Favor conectar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Pastas de sincronização não configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Nenhum.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Alterações Recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Abrir pasta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Pastas Gerenciadas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Calculando cota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Status desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Sair %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Conectar em...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Cota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 em uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Não há itens sincronizados recentemente</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
@@ -2254,98 +2239,54 @@ Tente sincronizar novamente.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Baixar</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Upload</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Contexto</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inativo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Iniciar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Finalizado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Para deleção</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>excluído</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Movido para %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>baixando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>enviando</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inativo</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>iniciando</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>finalizado</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>remover</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>mover</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>movido</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 84d8175..88d3a6c 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -124,42 +124,54 @@
<translation>Продолжить</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Подтвердите удаление папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Подтвердить сброс папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Начать</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Сейчас</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Полностью</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 из %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Полностью завершено.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Произошла внутренняя ошибка номер %1.</translation>
</message>
@@ -538,14 +525,14 @@
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -582,57 +569,57 @@ Are you sure you want to perform this operation?</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Ожидает, чтобы начать синхронизацию.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Сервер недоступен.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
@@ -1421,17 +1408,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
@@ -1439,7 +1426,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1447,7 +1434,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>не удалось создать директорию %1</translation>
</message>
@@ -1463,7 +1450,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1471,17 +1458,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1489,18 +1476,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Локальный файл изменился в процессе синхронизации, повторяем процесс</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1508,22 +1495,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1551,67 +1538,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Время</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Папка</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Действие</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Размер</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Повторить попытку синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопировать журнал синхронизации в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Скопировано в буфер обмена</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Статус синхронизации скопирован в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>На сервере нет места для хранения информации.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>На данный момент файлы, игнорируемые из-за ошибок, отсутствуют.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 файлов проигнорировано из-за ошибок.
@@ -1872,119 +1854,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Пожалуйста войдите в учётную запись</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Папка %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Нет папок для синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Пусто</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Недавние изменения</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Открыть %1 папку</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Управляемые папки:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Открыть папку '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Расчёт квоты...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Неизвестный статус</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Настройки...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Детали...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Помощь</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Выход %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Войти...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Квота недоступна</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>Используется %1% из %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Недавно ничего не синхронизировалсь</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Синхронизируются %1 из %2 (%3 из %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
@@ -2258,98 +2243,54 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Скачать</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Загрузка</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Контекст</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Неактивно</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Начало</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Завершено</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Для удаления</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>удален</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Перемещено в %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>скачиваю</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>загружаю на сервер</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>неактивно</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>начинается</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>завершено</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>удалить</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>переместить</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>перемещено</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 605b57c..f0617a6 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -124,42 +124,54 @@
<translation>Obnovenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdiť odstránenie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdiť resetovanie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Nenastavený žiaden účet.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Štart</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Aktuálne</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Úplne</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 z %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Úplne dokončené.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<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>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Úspech.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -582,57 +569,57 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Čakanie na štart synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Sever momentálne nie je prístupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Zrušenie používateľom</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia zapauzovaná)</translation>
</message>
@@ -1420,17 +1407,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizácia zrušená používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1438,7 +1425,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1446,7 +1433,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>nepodarilo sa vytvoriť priečinok %1</translation>
</message>
@@ -1462,7 +1449,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1470,17 +1457,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1488,18 +1475,18 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Lokálny súbor bol počas synchronizácie zmenený, zosynchronizuje sa, akonáhle bude kompletný</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizácia zrušená používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1507,22 +1494,22 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1550,67 +1537,62 @@ Nie je vhodné ju používať.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Čas</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Súbor</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Priečinok</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Akcia</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Veľkosť</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Opakovať synchronizáciu</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopírovať</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Skopírovať zoznam aktivít do schránky.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Skopírované do "clipboard"</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Stav synchronizácie bol nakopírovaný do schránky.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Nedostatok diskovej kapacity na serveri.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>V súčastnosti niesú na čiernej listine žiadne súbory kvôli predchádzajúcim chybovým stavom.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 súborov je na čiernej listine kvôli predchádzajúcim chybovým stavom.</translation>
@@ -1868,119 +1850,122 @@ Nie je vhodné ju používať.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Prihláste sa prosím</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Priečinok %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Nie sú nastavené žiadne synchronizačné priečinky.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Žiaden.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Nedávne zmeny</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Otvoriť %1 priečinok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Spravované priečinky:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Otvoriť priečinok '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Otvoriť %1 v prehliadači</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Počítanie kvóty...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Neznámy stav</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Nastavenia...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Detaily...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Ukončiť %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Prihlásiť</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Odhlásiť</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Kvóta n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 sa používa</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Žiadne nedávno synchronizované položky</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Synchronizovanie %1 z %2 (%3 z %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Až do dnešného dňa</translation>
</message>
@@ -2252,98 +2237,54 @@ Nie je vhodné ju používať.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Sťahovanie</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Odoslať</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Kontext</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Neaktívny</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Štart</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Dokončené</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Na zmazanie</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>zmazané</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Presunuté do %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>sťahujem</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>nahrávam</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>neaktívny</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>začínam</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>dokončené</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>vymazať</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>presunúť</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>presunuté</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 32a03ae..0742358 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -124,42 +124,54 @@
<translation>Nadaljuj</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Potrdi odstranitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Potrdi ponastavitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljenih %1 povezav.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Začni</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Trenutno</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>V celoti</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 od %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>V celoti končano.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <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>
@@ -538,14 +525,14 @@
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -582,57 +569,57 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<translation>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>V čakanju na začetek usklajevanja.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Strežnik trenutno ni na voljo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
@@ -1421,17 +1408,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
@@ -1439,7 +1426,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1447,7 +1434,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>ni mogoče ustvariti mape %1</translation>
</message>
@@ -1463,7 +1450,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1471,17 +1458,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1489,18 +1476,18 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1508,22 +1495,22 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Ni prejetega odziva s strežnnika s potrdilom o prejemu zadnjega dela datoteke (ni prejete oznake).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Ni razširitve X-OC-MTime, saj zahteva namestitev ownCloud 5.</translation>
</message>
@@ -1551,67 +1538,62 @@ Uporaba ni priporočljiva.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Čas</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Datoteka</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Mapa</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Dejanje</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Ponovno začni usklajevanje</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiraj seznam opravil v odložišče.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Kopirano v odložišče</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Stanje usklajevanja je kopirano v odložišče.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Na strežniku ni več razpoložljivega prostora.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Trenutno zaradi predhodnih napak ni prezrta nobena datoteka.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>%1 datotek je prezrtih zaradi predhodnih napak.
@@ -1872,119 +1854,122 @@ Te je treba uskladiti znova.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Pred nadaljevanjem je zahtevana prijava</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Mapa %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Brez</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Nedavne spremembe</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Odpri %1 mapo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Upravljane mape:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Odpri mapo '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Preračunavanje količinske omejitve ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Neznano stanje</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Nastavitve ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Podrobnosti ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Pomoč</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Končaj %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Prijava ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Količinska omejitev ni na voljo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Ni nedavno usklajenih predmetov</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Poteka usklajevanje %1 od %2 (%3 od %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
@@ -2256,98 +2241,54 @@ Te je treba uskladiti znova.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Prejmi</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Pošlji</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Vsebina</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Nedejavno</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Začni</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Končano</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Za izbris</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>izbrisano</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>Premaknjeno v %1</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>prejemanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>pošiljanje</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>nedejavno</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>začenjanje</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>končano</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>izbriši</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>premakni</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>premaknjeno</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 6e4d47b..909d14a 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -124,42 +124,54 @@
<translation>Återuppta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Bekräfta radering av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Bekräfta återställning av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
@@ -169,52 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Start</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>För närvarande:</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Fullständigt</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 av %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Helt klar.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Internt fel nummer %1 uppstod.</translation>
</message>
@@ -538,14 +525,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -582,57 +569,57 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Servern är för tillfället inte tillgänglig.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
@@ -1419,17 +1406,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1437,7 +1424,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1445,7 +1432,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1461,7 +1448,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1469,17 +1456,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna katalog får inte byta namn. Den kommer att döpas om till sitt original namn.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denna katalog får ej döpas om. Snälla döp den till Delad</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1487,18 +1474,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1506,22 +1493,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1549,67 +1536,62 @@ It is not advisable to use it.</source>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Tid</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Fil</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Mapp</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Ågärd</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Storlek</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Kopierat till urklipp</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Det finns inte tillräckligt med lagringsutrymme tillgängligt på servern.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1867,119 +1849,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Mapp %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Ingen synkroniseringsmapp är konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Ingen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Senaste ändringar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Öppna %1 mappen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Hanterade mappar:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>Öppna mapp '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Beräknar kvot...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Okänd status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Inställningar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Detaljer...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Hjälp</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>Avsluta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Kvot n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>%1% av %2 används</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Inga filer har synkroniseras nyligen</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Synkar %1 av %2 (%3 av %4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
@@ -2251,97 +2236,53 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Ladda ner</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Ladda upp</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Kontext</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Inaktiv</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Starta</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Klar</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>För radering</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>raderad</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>laddar ner</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>laddar upp</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>inaktiv</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>startar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>klar</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>radera</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index cc9a62e..648e3b6 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -124,42 +124,54 @@
<translation>ดำเนินการต่อ</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>ยืนยันการลบโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
@@ -169,52 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="605"/>
- <source>Start</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>เสร็จสิ้น</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>เกิดข้อผิดพลาดภายในระบบหมายเลข %1</translation>
</message>
@@ -538,30 +525,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -579,57 +566,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1414,17 +1401,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1432,7 +1419,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1440,7 +1427,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1456,7 +1443,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1464,17 +1451,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1482,18 +1469,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1501,22 +1488,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1544,67 +1531,62 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>แฟ้มเอกสาร</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>ขนาด</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>คัดลอก</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1862,119 +1844,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>เปิดโฟลเดอร์ %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>ช่วยเหลือ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -2246,97 +2231,53 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>ดาวน์โหลด</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>อัพโหลด</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
+ <source>Uploaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>ลบแล้ว</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>ลบ</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 499291d..da12c54 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -124,42 +124,54 @@
<translation>Відновлення</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Підтвердіть видалення каталогу</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
@@ -169,52 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="605"/>
- <source>Start</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>Успішно.</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Виникла внутрішня помилка за номером %1 .</translation>
</message>
@@ -538,30 +525,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -579,57 +566,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1414,17 +1401,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1432,7 +1419,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1440,7 +1427,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1456,7 +1443,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1464,17 +1451,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1482,18 +1469,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1501,22 +1488,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1544,67 +1531,62 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Час</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Тека</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Розмір</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Скопійовано в буфер обміну</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1862,119 +1844,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Жодна тека не налаштована для синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>Відкрити %1 каталог</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Керовані теки:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Допомога</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -2246,97 +2231,53 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>Завантажити</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Вивантажити</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
+ <source>Uploaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>видалені</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>видалити</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index e448196..5823f89 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -124,42 +124,54 @@
<translation>继续</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>确认移除文件夹</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>同步正在运行</translation>
</message>
@@ -169,52 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="605"/>
- <source>Start</source>
- <translation>开始</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>当前地</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>完整地</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 of %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>完全结束。</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>发生内部错误 %1</translation>
</message>
@@ -538,30 +525,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -579,57 +566,57 @@ Are you sure you want to perform this operation?</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>服务器当前是不可用的。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1414,17 +1401,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1432,7 +1419,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1440,7 +1427,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1456,7 +1443,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1464,17 +1451,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1482,18 +1469,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1501,22 +1488,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1544,67 +1531,62 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>时间</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>文件</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>文件夹</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>复制到剪贴板</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1862,119 +1844,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>文件夹 %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>没有已配置的同步文件夹。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>打开 %1 目录</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>管理的文件夹：</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>更新</translation>
</message>
@@ -2246,97 +2231,53 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>下载</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>上传</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <source>Uploaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>开始</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>完成</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>已经删除</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>删除</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index a2a3f00..7f7e746 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -124,42 +124,54 @@
<translation>繼續</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>確認移除資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>資料夾重設確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<source>No %1 connection configured.</source>
<translation>無%1連線設定</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>同步中</translation>
</message>
@@ -169,52 +181,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="605"/>
- <source>Start</source>
- <translation>啟動</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>目前</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>完成</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4 的 %5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>完成結束。</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="87"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>發生內部錯誤，錯誤編號 %1</translation>
</message>
@@ -538,30 +525,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -579,57 +566,57 @@ Are you sure you want to perform this operation?</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>等待啟動同步</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1414,17 +1401,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1432,7 +1419,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1440,7 +1427,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1456,7 +1443,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1464,17 +1451,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1482,18 +1469,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1501,22 +1488,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1544,67 +1531,62 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>時間</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>複製</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>複製至剪貼簿中</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation type="unfinished"/>
@@ -1862,119 +1844,122 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>資料夾 %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>尚未指定同步資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>開啟%1資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>管理的資料夾:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>說明</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>最新的</translation>
</message>
@@ -2246,97 +2231,53 @@ It is not advisable to use it.</source>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>下載</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>上傳</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
+ <source>Uploaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>啟動</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
+ <source>Moved to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>已刪除</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
- <source>Moved to %1</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>刪除</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 0d76b79..ea8c6af 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -124,42 +124,54 @@
<translation>Devam et</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="293"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="291"/>
<source>Confirm Folder Remove</source>
<translation>Klasör Kaldırma İşlemini Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="294"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="292"/>
<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="330"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="328"/>
<source>Confirm Folder Reset</source>
<translation>Klasör Sıfırlamayı Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="331"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="329"/>
<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="729"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="583"/>
+ <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"/>
+ <source>%1 %2</source>
+ <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="681"/>
<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="768"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="720"/>
<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="775"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="727"/>
<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="434"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="432"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
@@ -169,52 +181,27 @@
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="435"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="433"/>
<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="761"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="713"/>
<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="605"/>
- <source>Start</source>
- <translation>Başlat</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="614"/>
- <source>Currently</source>
- <translation>Geçerli</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="622"/>
- <source>Completely</source>
- <translation>Tam olarak</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="662"/>
- <source>%1 %2 %3 (%4 of %5)</source>
- <translation>%1 %2 %3 (%4/%5)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
- <source>Completely finished.</source>
- <translation>Tamamen bitti.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="672"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="595"/>
<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="764"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="716"/>
<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="733"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="685"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
@@ -245,178 +232,178 @@
<context>
<name>Mirall::CSyncThread</name>
<message>
- <location filename="../src/mirall/csyncthread.cpp" line="89"/>
+ <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="92"/>
+ <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="102"/>
+ <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="105"/>
+ <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="110"/>
+ <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="113"/>
+ <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="116"/>
+ <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="119"/>
+ <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="122"/>
+ <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="125"/>
+ <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="128"/>
+ <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="131"/>
+ <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="135"/>
+ <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="139"/>
+ <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="142"/>
+ <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="145"/>
+ <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="148"/>
+ <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="151"/>
+ <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="163"/>
+ <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="169"/>
+ <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="172"/>
- <location filename="../src/mirall/csyncthread.cpp" line="175"/>
+ <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="178"/>
+ <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="244"/>
+ <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="280"/>
+ <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="283"/>
+ <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="286"/>
+ <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="469"/>
+ <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="154"/>
+ <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="95"/>
+ <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="99"/>
+ <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="157"/>
+ <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="160"/>
+ <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="166"/>
+ <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="181"/>
+ <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="185"/>
+ <location filename="../src/mirall/csyncthread.cpp" line="183"/>
<source>An internal error number %1 happend.</source>
<translation>Hata iceri numarali %</translation>
</message>
@@ -538,14 +525,14 @@
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="731"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="734"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<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>
@@ -554,17 +541,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="738"/>
+ <location filename="../src/mirall/folder.cpp" line="704"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="740"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="741"/>
+ <location filename="../src/mirall/folder.cpp" line="707"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -582,57 +569,57 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<translation>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="741"/>
+ <location filename="../src/mirall/folderman.cpp" line="744"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="744"/>
+ <location filename="../src/mirall/folderman.cpp" line="747"/>
<source>Waits to start syncing.</source>
<translation>Eşitleme başlatmak için bekleniyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="747"/>
+ <location filename="../src/mirall/folderman.cpp" line="750"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="750"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Server is currently not available.</source>
<translation>Sunucu şu an kullanılabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="764"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Son eşitleme başarılıydı, ancak bireysel dosyalarda uyarılar vardı</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="767"/>
<source>Setup Error.</source>
<translation>Kurulum hatası.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="770"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
@@ -1420,17 +1407,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
<source>Sync was aborted by user.</source>
<translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket altık. Sonraki işlemde yeniden denenecek.</translation>
</message>
@@ -1438,7 +1425,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Bir dosya veya dizin bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation>
</message>
@@ -1446,7 +1433,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="109"/>
<source>could not create directory %1</source>
<translation>%1 dizini oluşturulamadı</translation>
</message>
@@ -1462,7 +1449,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="129"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Dosya salt okunur bir paylaşımdan kaldırılmıştı. Geri yüklendi.</translation>
</message>
@@ -1470,17 +1457,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="212"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="214"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Lütfen Paylaşılan olarak geri adlandırın.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="229"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi.</translation>
</message>
@@ -1488,18 +1475,18 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Eşitleme sırasında yerel dosya değişti, tamamen ulaştıktan sonra bir kez eşitlenecek</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
<source>Sync was aborted by user.</source>
<translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
@@ -1507,22 +1494,22 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="190"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="207"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="217"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>X-OC-MTime uzantısı yok, ownCloud 5 gerekli</translation>
</message>
@@ -1550,67 +1537,62 @@ Kullanmanız önerilmez.</translation>
<translation>4</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="47"/>
<source>Time</source>
<translation>Zaman</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="48"/>
<source>File</source>
<translation>Dosya</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="49"/>
<source>Folder</source>
<translation>Klasör</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="52"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="50"/>
<source>Action</source>
<translation>Eylem</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="53"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="51"/>
<source>Size</source>
<translation>Boyut</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="64"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="62"/>
<source>Retry Sync</source>
<translation>Eşitlemeyi Yeniden Dene</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="66"/>
<source>Copy</source>
<translation>Kopyala</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="69"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="67"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Etkinlik listesini panoya kopyala.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>Copied to clipboard</source>
<translation>Panoya kopyalandı</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="143"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="111"/>
<source>The sync status has been copied to the clipboard.</source>
<translation>Eşitleme durumu panoya kopyalandı.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="215"/>
- <source>No more storage space available on server.</source>
- <translation>Sunucuda daha fazla depolama alanı yok.</translation>
- </message>
- <message>
- <location filename="../src/mirall/protocolwidget.cpp" line="287"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="226"/>
<source>Currently no files are ignored because of previous errors.</source>
<translation>Önceki hata koşullarından dolayı yoksayılmış dosya yok.</translation>
</message>
<message>
- <location filename="../src/mirall/protocolwidget.cpp" line="289"/>
+ <location filename="../src/mirall/protocolwidget.cpp" line="228"/>
<source>%1 files are ignored because of previous errors.
Try to sync these again.</source>
<translation>Önceki hata koşullarından dolayı %1 dosya yoksayıldı.
@@ -1871,119 +1853,122 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
</message>
</context>
<context>
+ <name>Mirall::TokenCredentials</name>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="197"/>
+ <source>Enter Password</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/tokencredentials.cpp" line="198"/>
+ <source>Please enter %1 password for user '%2':</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
<source>Please sign in</source>
<translation>Lütfen oturum açın</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="195"/>
<source>Folder %1: %2</source>
<translation>Klasör %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="201"/>
<source>No sync folders configured.</source>
<translation>Eşitleme dizini yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="226"/>
<source>None.</source>
<translation>Hiçbiri.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="230"/>
<source>Recent Changes</source>
<translation>Son Değişiklikler</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="247"/>
<source>Open %1 folder</source>
<translation>%1 dizinini aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="257"/>
<source>Managed Folders:</source>
<translation>Yönetilen dizinler:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="260"/>
<source>Open folder '%1'</source>
<translation>'%1' klasörünü aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="333"/>
<source>Open %1 in browser</source>
<translation>%1'ı tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="335"/>
<source>Calculating quota...</source>
<translation>Kota hesaplanıyor...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="337"/>
<source>Unknown status</source>
<translation>Bilinmeyen durum</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="339"/>
<source>Settings...</source>
<translation>Ayarlar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Details...</source>
<translation>Ayrıntılar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Help</source>
<translation>Yardım</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="347"/>
<source>Quit %1</source>
<translation>%1'tan Çık</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Sign in...</source>
<translation>Oturum aç...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Sign out</source>
<translation>Oturumu kapat</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="360"/>
<source>Quota n/a</source>
<translation>Kota kullanılamıyor</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="367"/>
<source>%1% of %2 in use</source>
<translation>% %1 kullanılıyor. Toplam: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
- <source>No items synced recently</source>
- <translation>Son zamanda eşitlenen öge yok</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="402"/>
- <source>%1 (%2, %3)</source>
- <translation>%1 (%2, %3)</translation>
- </message>
- <message>
- <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
- <source>Syncing %1 of %2 (%3 of %4) </source>
- <translation>Eşitlenen %1/%2 (%3/%4) </translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <source>Syncing %1 of %2 (%3 of %4)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
@@ -2255,98 +2240,54 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>progress</name>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="31"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="43"/>
- <source>Download</source>
- <translation>İndir</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="32"/>
+ <source>Downloaded</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="34"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="47"/>
- <source>Upload</source>
- <translation>Yükle</translation>
+ <source>Uploaded</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="37"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="91"/>
- <source>Context</source>
- <translation>Bağlam</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="36"/>
+ <source>Deleted</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
- <source>Inactive</source>
- <translation>Etkin değil</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="50"/>
- <source>Start</source>
- <translation>Başlat</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="53"/>
- <source>Finished</source>
- <translation>Tamamlandı</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
- <source>For deletion</source>
- <translation>Silmek için</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="59"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="118"/>
- <source>deleted</source>
- <translation>silindi</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="62"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="38"/>
<source>Moved to %1</source>
<translation>%1 konumuna taşındı</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="85"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="97"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="103"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="41"/>
+ <source>Unknown</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="52"/>
<source>downloading</source>
<translation>indiriliyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="88"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="100"/>
- <location filename="../src/mirall/progressdispatcher.cpp" line="106"/>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="54"/>
<source>uploading</source>
<translation>yükleniyor</translation>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="94"/>
- <source>inactive</source>
- <translation>etkin değ</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="109"/>
- <source>starting</source>
- <translation>başlatılıyor</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="112"/>
- <source>finished</source>
- <translation>tamamlandı</translation>
- </message>
- <message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="115"/>
- <source>delete</source>
- <translation>sil</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="56"/>
+ <source>deleting</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="121"/>
- <source>move</source>
- <translation>taşı</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="58"/>
+ <source>moving</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/progressdispatcher.cpp" line="124"/>
- <source>moved</source>
- <translation>taşındı</translation>
+ <location filename="../src/mirall/progressdispatcher.cpp" line="61"/>
+ <source>processing</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
--
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