[Pkg-owncloud-commits] [owncloud-client] 88/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:38 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 0cc0eed8a8d7872c3f7a49ad792a14b634752320
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Fri Feb 28 01:26:23 2014 -0500
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 237 ++++++++++++++++++++------------------
translations/mirall_cs.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_de.ts | 241 ++++++++++++++++++++-------------------
translations/mirall_el.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_en.ts | 237 ++++++++++++++++++++------------------
translations/mirall_es.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_es_AR.ts | 237 ++++++++++++++++++++------------------
translations/mirall_et.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_eu.ts | 237 ++++++++++++++++++++------------------
translations/mirall_fa.ts | 237 ++++++++++++++++++++------------------
translations/mirall_fi.ts | 237 ++++++++++++++++++++------------------
translations/mirall_fr.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_gl.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_hu.ts | 237 ++++++++++++++++++++------------------
translations/mirall_it.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_ja.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_nl.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_pl.ts | 237 ++++++++++++++++++++------------------
translations/mirall_pt.ts | 263 +++++++++++++++++++++++--------------------
translations/mirall_pt_BR.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_ru.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_sk.ts | 237 ++++++++++++++++++++------------------
translations/mirall_sl.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_sv.ts | 237 ++++++++++++++++++++------------------
translations/mirall_th.ts | 237 ++++++++++++++++++++------------------
translations/mirall_uk.ts | 237 ++++++++++++++++++++------------------
translations/mirall_zh_CN.ts | 239 ++++++++++++++++++++-------------------
translations/mirall_zh_TW.ts | 237 ++++++++++++++++++++------------------
translations/pofiles/tr.po | 239 ++++++++++++++++++++-------------------
29 files changed, 3654 insertions(+), 3277 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 71887b7..1a3f654 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Nota</b> Algunes carpetes, incloent els fitxers muntats a través de xarxa o compartits, poden tenir límits diferents.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Confirma l'eliminació de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Confirmeu la reinicialització de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>S'està sincronitzant</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>No hi ha cap compte configurat</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 de %2 (%3%) en ús.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Comença</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Actualment</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Copletament</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Sense connexió amb %1 a <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>La connexió ha fallat</translation>
</message>
@@ -442,79 +442,79 @@
<translation>No s'ha pogut crear el context-csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>El fitxer local %1 no existeix.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 hauria de ser una carpeta, però no ho és.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Fitxer %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>baixat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>eliminat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>actualitzat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>reanomena</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>mogut</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' ha estat %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Fitxers %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' i %2 altres fitxers s'han %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -801,12 +801,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Escriviu contrasenya</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
</message>
@@ -1388,25 +1388,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1414,42 +1422,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>No s'ha pogut esborrar la carpeta %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1458,16 +1466,26 @@ It is not advisable to use it.</source>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1622,113 +1640,108 @@ Assegureu-vos que la connexió a la xarxa funciona.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Nom comú (NC):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organització (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Unitat organitzativa (UO):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Estat o província</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>País:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Emissor:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Enviat el:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Expira el:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1832,117 +1845,117 @@ Assegureu-vos que la connexió a la xarxa funciona.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Acrediteu-vos</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>No hi ha fitxers de sincronització configurats</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Cap.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Canvis recents</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Obre la carpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Fitxers gestionats:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Obre carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Obre %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Calculant la quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Estat desconegut</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Arranjament...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Detalls...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Surt %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Acredita...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Surt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Quota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1 de %2 en ús</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Actualitzat</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index b706468..ee020d9 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pozastavit</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Poznámka:</b> Některé složky, včetně síťových či sdílených složek, mohou mít jiné limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Obnovit</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdit odstranění složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdit restartování složky</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 z %2 (%3%) v užívání.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <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="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Aktuálně</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Úplně</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Žádné spojení k %1 v <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<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>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Spojení selhalo</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Nepodařilo se vytvořit csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Místní složka %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 by měl být adresář, ale není.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Soubor %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>staženo</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>odstraněno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>aktualizováno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>přejmenováno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>přesunuto</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 do %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' byl %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Soubory %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation> '%1' a %2 dalších souborů bylo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -801,12 +801,12 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Zadejte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation>
</message>
@@ -1390,25 +1390,33 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -1416,42 +1424,42 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Nepodařilo se odstranit adresář %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Soubor by odebrán ze sdílení pouze pro čtení. Soubor byl obnoven.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Soubor by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1460,16 +1468,26 @@ Nedoporučuje se jí používat.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1626,114 +1644,109 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Detaily certifikátu</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Běžný název (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Alternativní jména subjektu:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organizace (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Organizační jednotka (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Stát/provincie:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Země:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Sériové číslo:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Vydavatel</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Vydavatel:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Vydáno:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Platný do:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Otisky</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Poznámka:</b> Tento certifikát byl schválen ručně</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (v úložišti kořenových CA)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (podepsaný sám sebou)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Toto spojení je šifrováno pomocí %1 bitové šifry %2
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Informace o certifikátu:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Toto spojení NENÍ bezpečné, protože není šifrované.
@@ -1838,117 +1851,117 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Přihlašte se prosím</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Složka %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Nejsou nastaveny žádné synchronizované složky.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Nic.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Poslední změny</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Otevřít složku %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Spravované složky:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Otevřít složku '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Počítám kvóty...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Neznámý stav</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Nastavení...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Podrobnosti...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Ukončit %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Přihlásit...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Odhlásit</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Kvóta nedostupná</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<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="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 96f6ddd..46e4403 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Anhalten</translation>
</message>
@@ -119,103 +119,103 @@
<translation><b>Hinweis:</b> Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner, können unterschiedliche Beschränkungen haben.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Fortsetzen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Löschen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Zurücksetzen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 von %2 (%3%) benutzt.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Gegenwärtig</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Vollständig</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Keine Verbindung mit %1 zu <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
@@ -223,7 +223,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Verbindung fehlgeschlagen</translation>
</message>
@@ -443,79 +443,79 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Kann keinen CSync-Kontext erstellen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Datei %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>Heruntergeladen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>Entfernt</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>Aktualisiert</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>Umbenannt</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>verschoben</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 nach %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' wurde %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Dateien %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' und %2 andere Dateien wurden %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -524,17 +524,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -802,12 +802,12 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Passwort eingeben</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation>
</message>
@@ -1391,25 +1391,33 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
@@ -1417,42 +1425,42 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Verzeichnis %1 konnte nicht entfernt werden</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Eine Datei wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1461,16 +1469,26 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1626,114 +1644,109 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Zertifikatdetails</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Gemeinsamer Name (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Subject Alternative Names:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organisation (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Organisationseinheit (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Staat/Provinz:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Land:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Seriennummer:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Aussteller</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Aussteller:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Ausgestellt am:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Ablaufdatum:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Fingerabdrücke</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Hinweis:</b> Dieses Zertifikat wurde manuell bestätigt</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (im Wurzel - CA-Speicher)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (selbst signiert)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Diese Verbindung ist verschlüsselt mit %1 Bit %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Zertifikatsinformation:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Diese Verbindung ist NICHT sicher, da diese nicht verschlüsselt ist.
@@ -1838,117 +1851,117 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Bitte melden Sie sich an</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Ordner %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Keine Sync-Ordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Keine.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Letzte Änderungen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Ordner %1 öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Verwaltete Ordner:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Ordner '%1' öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Berechne Quote...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Unbekannter Status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Details...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Anmeldung...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Abmeldung</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Quote unbekannt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% von %2 benutzt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="393"/>
<source>No items synced recently</source>
<translation>Keine kürzlich synchronisierten Elemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
@@ -2372,4 +2385,4 @@ Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translatio
<translation>Synchronisation wurde angehalten</translation>
</message>
</context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index f2745aa..2b480e4 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Παύση</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Σημείωση:</b> Κάποιοι φάκελοι, συμπεριλαμβανομένων των δικτυακών δίσκων ή των κοινόχρηστων φακέλων, μπορεί να έχουν διαφορετικά όρια. </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Συνέχεια</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Επιβεβαίωση αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Δεν υπάρχει σύνδεση με το %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Ο Συγχρονισμός Εκτελείται</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 από %2 (%3%) σε χρήση.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Έναρξη</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Τώρα</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Ολοκληρωτικά</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation>Ολοκληρώθηκε.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Δεν ήταν δυνατή σύνδεση με το %1 στο <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Σύνδεση απέτυχε</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Αδυναμία δημιουργίας πλαισίου csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 επρεπε να ειναι χωρος αποθηκευσης αλλα δεν ειναι.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation> %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Αρχείο %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>κατέβηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>αφαιρέθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>ενημερώθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>μετονομάστηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>μετακινήθηκαν</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 προς %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>Το '%1' %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Αρχεία %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>Τα '%1' και άλλα %2 αρχεία %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -801,12 +801,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation>
</message>
@@ -1390,25 +1390,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>αδυναμία δημιουργίας καταλόγου %1</translation>
</message>
@@ -1416,42 +1424,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Αδυναμία αφαίρεσης καταλόγου %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Το αρχείο διαγράφηκε από ένα διαμοιρασμένο κατάλογο χωρίς άδεια εγγραφής. Το αρχείο επαναφέρθηκε.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Ένα αρχείο διαγράφηκε από ένα διαμοιρασμένο κατάλογο χωρίς άδεια εγγραφής, αλλά η επαναφορά απέτυχε: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού, θα συγχρονιστεί και πάλι όταν φτάσει πλήρως</translation>
</message>
@@ -1460,16 +1468,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1625,113 +1643,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Λεπτομέρειες Πιστοποιητικού</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Κοινό Όνομα (ΚΝ):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Εναλλακτικά Ονόματα Υποκειμένου:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Οργανισμός (Ο):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Μονάδα Οργανισμού (ΜΟ):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Νομός ή περιφέρεια:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Χώρα:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Σειριακός αριθμός:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Εκδότης</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Εκδότης:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Εκδόθηκε στις:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Λήγει στις:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Αποτυπώματα</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation>p><b>Σημείωση:</b> Αυτό το πιστοποιητικό εγκρίθηκε χειροκίνητα</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (στο κατάστημα ρίζας CA)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (αυτό-πιστοποιημένο)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Πληροφορίες πιστοποιητικού:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Αυτή η σύνδεση δεν είναι ασφαλής καθώς δεν είναι κρυπτογραφημένη.
@@ -1836,117 +1849,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Παρκαλώ συνδεθείτε</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Φάκελος %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Κανένας.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Πρόσφατες Αλλαγές</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Άνοιγμα %1 φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Διαχείριση αρχείων:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Άνοιγμα καταλόγου '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Υπολογισμός μεριδίου χώρου αποθήκευσης...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Άγνωστη κατάσταση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Ρυθμίσεις...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Λεπτομέρειες...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Βοήθεια</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Κλείσιμο %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Σύνδεση...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Μερίδιο χώρου αποθήκευσης δεν είναι διαθέσιμο</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Συγχρονισμός %1 από %2 (%3 από %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 375ac15..3d5e56f 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -91,7 +91,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation type="unfinished"></translation>
</message>
@@ -121,102 +121,102 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
@@ -224,7 +224,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation type="unfinished"></translation>
</message>
@@ -444,95 +444,95 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -800,12 +800,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"></translation>
</message>
@@ -1385,25 +1385,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1411,42 +1419,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"></translation>
</message>
@@ -1455,16 +1463,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <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>
@@ -1618,113 +1636,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"></translation>
@@ -1828,117 +1841,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 59c0102..472e491 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Nota:</b> Algunas carpetas, incluyendo unidades de red o carpetas compartidas, pueden tener límites diferentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar la eliminación de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Confirme que desea restablecer la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<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="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>No se ha configurado la cuenta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 de %2 (%3%) en uso.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Iniciar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Actualmente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation>Finalizado</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Sin conexión a %1 en <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>La conexión falló</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Archivo %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>Descargado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>eliminado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>Actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>Renombrado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' ha sido %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Archivos %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' y %2 otros archivos son %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -801,12 +801,12 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Introduzca la Contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, introduzca su %1 contraseña para el usuario '%2':</translation>
</message>
@@ -1390,25 +1390,33 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>No se pudo crear el directorio %1</translation>
</message>
@@ -1416,42 +1424,42 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>No se pudo eliminar el directorio %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>El archivo fue retirado de una carpeta compartida en modo de solo lectura. El archivo ha sido restaurado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Un archivo fue retirado de una carpeta compartida en modo de solo lectura, pero su restauración falló: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1460,16 +1468,26 @@ No se recomienda usarlo.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1625,114 +1643,109 @@ Por favor asegurese de que la conexión de red está trabajando.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Detalles del certificado</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Nombre común (NC):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Nombres alternativos del sujeto:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organización (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Unidad organizacional (UO):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Estado/provincia:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Pais:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>nº serie:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Emisor</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Emisor:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Emitido en:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Expira en:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Firma</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Notificación:</b> Este certificado fue aprobado manualmente</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (in Root CA store)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (self-signed)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Esta conexión está cifrada con %1 bit %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Información del certificado:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Esta conexión NO ES SEGURA, pues no está cifrada.
@@ -1837,117 +1850,117 @@ Por favor asegurese de que la conexión de red está trabajando.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Por favor Registrese</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>No hay carpetas de sincronización configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Ninguno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Abrir carpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Carpetas administradas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Calculando cuota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Salir de %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Registrarse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Cuota no disponible</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index d247cc8..a185742 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pausar</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Nota:</b> Algunas carpetas, incluidas las montadas en red o las carpetas compartidas, pueden tener diferentes límites.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Confirmá la eliminación del directorio</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Confirme el reseteo de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<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="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 de %2(%3) en uso.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Inicio</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Actualmente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Sin conexión a %1 en <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Fallo de Conexión</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>El directorio local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Archivo %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>descargado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>removido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>renombrado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' ha sido %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Archivos %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' y %2 otros archivos han sido %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -801,12 +801,12 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Ingresar contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation>
</message>
@@ -1388,25 +1388,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1414,42 +1422,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1458,16 +1466,26 @@ It is not advisable to use it.</source>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1623,113 +1641,108 @@ Por favor asegúrese que su conexión de red esté en buen estado.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Pais:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1833,117 +1846,117 @@ Por favor asegúrese que su conexión de red esté en buen estado.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Por favor, inicie sesión</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Directorio %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<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="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Ninguno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Abrir directorio %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Directorios administrados:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Calculando cuota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Cancelar %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Iniciando sesión...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Salir</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Cuota no disponible</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>actualizado</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 0ae6277..05f67db 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Märkus:</b> Mõned kataloogid, sealhulgas võrgust ühendatud või jagatud kataloogid, võivad omada erinevaid limiite.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Taasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Kinnita kausta eemaldamist</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Kinnita kataloogi algseadistus</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>Kasutusel %1 / %2 (%3%)</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Hetkel</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Täielikult</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Ühendus puudub %1 at <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Ühendus ebaõnnestus</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Ei suuda luua csync-konteksti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 peaks olema kataloog, kuid pole seda mitte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Fail %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>allalaaditud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>eemaldatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>uuendatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>ümber nimetatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>ümber tõstetud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 kuni %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' on olnud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Failid %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' ja %2 teist faili on olnud %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -801,12 +801,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Sisesta parool</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Palun sisesta %1 parool kasutajale '%2':</translation>
</message>
@@ -1390,25 +1390,33 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>ei suuda luua kataloogi %1</translation>
</message>
@@ -1416,42 +1424,42 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Kausta %1 ei saa eemaldada</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Fail oli kustutatud kirjutamisõiguseta kataloogist, kuid on nüüd taastatud.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Fail oli eemaldatud kirjutamisõiguseta kataloogist ning taastamine ebaõnnestus: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1460,16 +1468,26 @@ Selle kasutamine pole soovitatav.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1625,114 +1643,109 @@ Palun veendu, et võrguühendus toimib.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Sertifikaadi detailid</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Üldine nimi (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Subjekti Alternatiivsed Nimed:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organisatsioon (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Organisatsiooni üksus (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Riik/Maakond:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Riik:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Järjenumber:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Väljastaja</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Väljastaja:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Väljastatud:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Aegub:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Sõrmejäljendid</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Märkus</b>See sertifikaat on käsitsi heakskiidetud</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (juursertifikaadihoidlas)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (oma-signeering)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Ühendus on krüpteeritud kasutades %1 bitt %2
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Seritifikaadi informatsioon:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>See url EI OLE turvaline, kuna see pole krüpteeritud.
@@ -1837,117 +1850,117 @@ Palun veendu, et võrguühendus toimib.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Palun logi sisse</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Kaust %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Pole.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Hiljutised muudatused</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Ava kaust %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Hallatavad kaustad:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Ava kaust '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Ava %1 veebilehitsejas</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Mahupiiri arvutamine...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Tundmatu staatus</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Seaded...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Üksikasjad...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Abiinfo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Lõpeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Logi sisse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Logi välja</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Mahupiir n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>Kasutusel %1% / %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index e5c9394..e93290d 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pausarazi</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Oharra:</b>Karpeta batzuk, sarekoa edo partekatutakoak, muga ezberdinak izan ditzazkete.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Berrekin</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Baieztatu karpetaren ezabatzea</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%2tik %1 (%%3) erabilita.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Hasi</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Orain</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Guztiz</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Konexioak huts egin du</translation>
</message>
@@ -442,95 +442,95 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Bertako %1 karpeta ez da existitzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 karpeta bat izan behar zen baina ez da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>%1 Fitxategia</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>deskargatuta</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>ezabatuta</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>eguneratuta</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>berrizendatuta</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>mugitua</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' '%2' izan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Sartu Pasahitza</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation>
</message>
@@ -1385,25 +1385,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>Ezin izan da %1 karpeta sortu</translation>
</message>
@@ -1411,42 +1419,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Ezin izan da %1 karpeta ezabatu</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Fitxategia irakurtzeko bakarrik zen partekatze batetik ezabatu da. Fitxategia leheneratu da.</translation>
- </message>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1455,16 +1463,26 @@ It is not advisable to use it.</source>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1619,113 +1637,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>>Ziurtagiriaren Zehaztapenak</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Erakundea (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Erakunde Atala (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Estatua/Erkidegoa:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Herrialdea:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1829,117 +1842,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Mesedez saioa hasi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Ez dago sinkronizazio karpetarik definituta.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Bat ere ez.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Azkenengo Aldaketak</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Ireki %1 karpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Kudeatutako karpetak:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Ireki '%1' karpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Ireki %1 arakatzailean</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Egoera ezezaguna</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Ezarpenak...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Xehetasunak...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Laguntza</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>%1etik Irten</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Saioa hasi...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Saioa bukatu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%2tik %%1 erabilita</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Eguneratua</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 6d006b5..b229f6b 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>توقف کردن</translation>
</message>
@@ -119,102 +119,102 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>قبول کردن پاک شدن پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -442,95 +442,95 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 باید یک پوشه باشد اما نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1383,25 +1383,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1409,42 +1417,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1453,16 +1461,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1616,113 +1634,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>کشور:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1826,117 +1839,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>پوشه %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>هیچ پوشه ای همگام سازی شدهای تنظیم نشده است</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>بازکردن %1 پوشه</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>پوشه های مدیریت شده:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>راهنما</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index b299963..9f3d5fc 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Keskeytä</translation>
</message>
@@ -119,102 +119,102 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Jatka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Vahvista kansion poisto</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1/%2 (%3 %) käytössä.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Yhteys epäonnistui</translation>
</message>
@@ -442,95 +442,95 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Paikallista kansiota %1 ei ole olemassa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Tiedosto %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>ladattu</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>poistettu</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>päivitetty</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>nimetty uudelleen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>siirretty</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' on %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Tiedostot %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' ja %2 muuta tiedostoa on %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Anna salasana</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Anna käyttäjän '%2' %1-salasana:</translation>
</message>
@@ -1384,25 +1384,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1410,42 +1418,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Kansion %1 poistaminen epäonnistui</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1454,16 +1462,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1617,113 +1635,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Varmenteen tiedot</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Maa:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Myöntäjä</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Myöntäjä:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Myönnetty:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Vanhenee:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Sormenjäljet</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Varmenteen tiedot:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1827,117 +1840,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Kirjaudu sisään</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Kansio %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Synkronointikansioita ei ole määritetty.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Viimeisimmät muutokset</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Avaa %1-kansio</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Hallitut kansiot:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Avaa kansio '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Avaa %1 selaimeen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Lasketaan kiintiötä...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Tuntematon tila</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Asetukset...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Tiedot...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Ohje</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Lopeta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Kirjaudu sisään...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Kirjaudu ulos</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1%/%2 käytössä</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Synkronoidaan %1/%2 (%3/%4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Ajan tasalla</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index da8e02f..b1de1d4 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Mettre en pause</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Note :</b> Certains fichiers, incluant des dossiers montés depuis le réseau ou des dossiers partagés, peuvent avoir des limites différentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Reprendre</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Confirmer le retrait du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Confirmation de la réinitialisation du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 of %2 (%3%) occupés.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Démarrer</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Actuellement</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Complètement</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Aucune connexion à %1 pour <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Échec de la connexion</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Impossible de créer le contexte csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Le dossier local %1 n'existe pas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 doit être un répertoire, mais ce n'en ai pas un.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Fichier %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>téléchargé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>supprimé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>mis à jour</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>renommé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>déplacé</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 à %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' a été %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Fichiers %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' et %2 autres fichiers ont été %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -801,12 +801,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Entrez le mot de passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
</message>
@@ -1390,25 +1390,33 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>impossible de créer le répertoire %1</translation>
</message>
@@ -1416,42 +1424,42 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Impossible de supprimer le dossier %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Ce fichier a été retiré d’un partage en lecture seule. Il a été restauré.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Un fichier a été retiré d’un partage en lecture seule, mais sa restauration a échoué : %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1460,16 +1468,26 @@ Il est déconseillé de l'utiliser.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1625,114 +1643,109 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Détails du certificat</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Nom commun (CN) :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Noms alternatifs du sujet :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organisation (O) :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Unité d'organisation (OU) :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>État/Région :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Pays :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Numéro de série :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Émetteur</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Émetteur :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Émis le :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Expire le :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Empreintes numériques</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD5 :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1 :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Note :</b> Ce certificat a été approuvé manuellement</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (dans le dépôt CA racine)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (auto-signé)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Cette connexion est chiffrée en utilisant %1 bit %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Informations du certificat :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Cette connexion n'est PAS sécurisée car elle n'est pas chiffrée.
@@ -1837,117 +1850,117 @@ Veuillez vous assurer qu'une connexion réseau est disponible.</translation
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Veuillez vous connecter</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Dossier %1 : %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Aucun répertoire synchronisé n'est configuré.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Aucun.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Modifications récentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Ouvrir le répertoire %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Répertoires suivis :</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Ouvrir le dossier '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Calcul du quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Statut inconnu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Paramètres...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Détails...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Quitter %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Se connecter...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Quota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 occupés</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 9eccaab..27f1916 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Nota:</b> Algúns cartafoles, como os cartafoles de rede montados ou os compartidos, poden ten diferentes límites.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar a eliminación do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar o restabelecemento do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>Usado %1 de %2 (%3%).</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Iniciar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Actual</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Completado</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Sen conexión con %1 en <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<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>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Produciuse un fallo de conexión</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Non é posíbel crear o contexto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>O cartafol local %1 non existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio e non o é.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Ficheiro %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>descargado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>Retirado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>renomeado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 de %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>«%1» foi %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Ficheiros %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>«%1» e outros %2 ficheiros foron %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -801,12 +801,12 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Escriba o contrasinal</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriba o contrasinal %1 para o usuario «%2»:</translation>
</message>
@@ -1390,25 +1390,33 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>non foi posíbel crear o directorio %1</translation>
</message>
@@ -1416,42 +1424,42 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Non foi posíbel retirar o directorio %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>O ficheiro foi retirado da compartición de só lectura. O ficheiro foi restaurado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Un ficheiro foi retirado da compartición de só lectura, mais a restauración fracasou: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1460,16 +1468,26 @@ Recomendámoslle que non o use.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1625,114 +1643,109 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Detalles do certificado</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Nome común (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Nomes alternativos do titular:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organización (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Unidade organizativa (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Estado/provincia:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>País</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Serie:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Emisor</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Emisor:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Emitido o:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Caduca o:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Pegadas dixitais</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Nota:</b> Este certificado foi aprobado manualmente</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (no almacén de CA do Root)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (autoasinada)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Esta conexión está cifrada empregando %1 a %2 bits.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Información do certificado:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Esta conexión non é segura e non está cifrada.
@@ -1837,117 +1850,117 @@ Asegúrese de que a súa conexión de rede está a funcionar.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Ten que rexistrarse</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Cartafol %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Non se configuraron cartafoles de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Nada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Cambios recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Abrir o cartafol %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Cartafoles xestionados:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Abrir o cartafol «%1»</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Calculando a cota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Estado descoñecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Axustes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Axuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Saír de %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Rexistrarse...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Saír</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Cota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>Usado %1% de %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 9f1de0c..b80dcd6 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Szünet</translation>
</message>
@@ -119,102 +119,102 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Folytatás</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<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="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Szinkronizálás fut</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Nincs beállított kapcsolat.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>A kapcsolódás sikertelen</translation>
</message>
@@ -442,95 +442,95 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 helyi mappa nem létezik.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 könyvtár kell legyen, de nem az.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>letöltva</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>eltávolítva</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>módosítva</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>átnevezve</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>mozgatva</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Jelszómegadás</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1383,25 +1383,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1409,42 +1417,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1453,16 +1461,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1616,113 +1634,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Tanúsítvány részletei</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Általános név (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>A tárgy további nevei:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Szervezet (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Szervezeti egység (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Tagállam/Megye:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Ország:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Sorozatszám:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Kibocsátó</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Aláíró:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Kibocsátva:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Lejárat:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Ujjlenyomatok</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Megjegyzés:</b> A tanúsítvány kézileg jóváhagyva</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (legfelső szintű tárban)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (önaláírt)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Tanúsítvány adatok:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1826,117 +1839,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Belépés szükséges</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Mappa %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Nincsenek megadva szinkronizálandó mappák.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Nincs</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Legutóbbi változások</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>%1 mappa megnyitása</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Kezelt mappák:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Kvóta kiszámítása...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Ismeretlen állapot</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Beállítások...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Részletek...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Súgó</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Belépés...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Kilépés</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Kvóta n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Frissítve</translation>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 3d9e261..ebf55f1 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Nota:</b> alcune cartelle, incluse le cartelle montate o condivise in rete, potrebbero avere limiti diversi.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Riprendi</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Conferma la rimozione della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Conferma il ripristino della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 di %2 (%3%) utilizzati.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Avvia</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Attualmente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Nessuna connessione a <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Connessione non riuscita</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Impossibile creare il contesto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>La cartella locale %1 non esiste.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 dovrebbe essere una cartella.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>File %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>scaricato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>rimosso</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>aggiornato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>rinominato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>spostato</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>Da %1 a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' è stato %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>File %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' e %2 altri file sono stati %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -801,12 +801,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Digita la password</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Digita la password di %1 per l'utente '%2':</translation>
</message>
@@ -1389,25 +1389,33 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -1415,42 +1423,42 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Impossibile rimuovere la cartella %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Il file era stato rimosso da una condivisione in sola lettura. Il file è stato ripristinato.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Un file era stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1459,16 +1467,26 @@ Non è consigliabile utilizzarlo.</translation>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1624,114 +1642,109 @@ Assicurati che la tua connessione sia funzionante.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Dettagli del certificato</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Nome comune (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Nomi alternativi soggetto (SAN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organizzazione (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Unità organizzativa (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Stato/Regione:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Nazione:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Numero di serie:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Emittente</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Emittente:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Emesso il:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Scade il:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Impronte digitali</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Nota:</b> questo certificato è stato approvato manualmente</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (nel deposito della CA radice)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (autofirmato)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Questa connessione è cifrata utilizzando %1 bit %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Informazioni sul certificato:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Questa connessione NON è sicura poiché non è cifrata.
@@ -1836,117 +1849,117 @@ Assicurati che la tua connessione sia funzionante.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Cartella %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Nessuna cartella configurata per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Nessuna.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Modifiche recenti</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Apri la cartella %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Cartelle gestite:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Apri la cartella '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Calcolo quota in corso...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Stato sconosciuto</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Impostazioni...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Dettagli...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Aiuto</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Esci da %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Accedi...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Quota n/d</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% di %2 utilizzati</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 8633dde..ec72405 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>一時停止</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>注:</b> 外部ネットワークストレージ、共有フォルダーを含んだフォルダーの場合は、上限値が異なることがあります。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>フォルダーの削除を確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>フォルダーのリセットを確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 / %2 (%3%) を使用中です。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>開始</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>現在</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>完全に</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation>完全に終了しました。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>%1 に接続していません: <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>接続に失敗</translation>
</message>
@@ -442,79 +442,79 @@
<translation>csync-context を作成できません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 はディレクトリのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>ファイル %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>ダウンロード完了</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>アップデート済</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>名前変更</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>移動</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 から %2 へ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' は %2 です。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>ファイル %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' と %2 個のファイルは %3 です。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -802,12 +802,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>パスワードを入力してください</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>ユーザー '%2' の %1 パスワードを入力してください:</translation>
</message>
@@ -1389,25 +1389,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>ディレクトリ %1 を作成できませんでした</translation>
</message>
@@ -1415,42 +1423,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>ディレクトリ %1 を削除できません</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>ファイルは読み込み専用の共有から削除されました。ファイルは復元されます。</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>ファイルは読み込み専用の共有から削除されましたが、ファイルの復元に失敗しました: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>同期中にローカルファイルが変更されました。完了してからもう一度同期してください。</translation>
</message>
@@ -1459,16 +1467,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1624,114 +1642,109 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>詳細認証情報</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>コモンネーム(CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>組織(O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>部門名(OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>州／県:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>国:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>シリアル番号:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>発行者</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>発行者: %1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>期限切れ期日:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>フィンガープリント</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>注意:</b> この認証は手動で承認されました</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (信頼されたルート証明書)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (自己証明書)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>この接続は、%1 を使って、%2 bit で暗号化されています。
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>認証情報:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>暗号化されていないので、この接続は安全ではありません。
@@ -1836,117 +1849,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>サインインしてください</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>フォルダー %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>同期フォルダーが設定されていません。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>なし</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>最近変更されたファイル</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>%1 フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>管理フォルダー:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>フォルダー ’%1’ を開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>クォータを計算中...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>不明な状態</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>詳細...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>ヘルプ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>サインイン...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>クォータ n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%2 のうち %1% を使用中</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>最近です</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 85c68a3..673c363 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Opmerking:</b> Sommige mappen, waaronder netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Hervatten</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Bevestig het verwijderen van de map</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Bevestig map reset</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 van %2 (%3%) in gebruik.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Momenteel</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Volledig</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Geen verbinding met %1 op <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<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>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Verbinding mislukt</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Onmogelijk om een csync-context te maken</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 zou een map moeten zijn, maar is dit niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Bestand %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>gedownload</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>verwijderd</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>geüpdatet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>hernoemd</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>verplaatst</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 naar %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' was %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Bestanden %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' en %2 andere bestanden waren %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -801,12 +801,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Vul het wachtwoord in</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
</message>
@@ -1390,25 +1390,33 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -1416,42 +1424,42 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Kon map %1 niet verwijderen</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Het bestand was verwijderd van een alleen-lezen share. Het bestand is hersteld.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Een bestand is verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1460,16 +1468,26 @@ We adviseren deze site niet te gebruiken.</translation>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1625,114 +1643,109 @@ Controleer de werking van uw netwerkverbinding.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Certificaat details</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Common Name (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Alternatieve subject namen:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organisatie (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Organisatie unit (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Land/Provincie:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Land:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Serienummer:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Uitgever</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Uitgever:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Uitgegeven op:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Vervalt op:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Vingerafdrukken</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Let op:</b> Dit certificaat werd handmatig goedgekeurd</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (in Root CA database)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (zelf ondertekend)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Deze verbinding is versleuteld via %1 bit %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Certificaat informatie:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Deze verbinding is NIET veilig, omdat de verbinding niet is versleuteld.
@@ -1837,117 +1850,117 @@ Controleer de werking van uw netwerkverbinding.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Log alstublieft in</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Map %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Geen synchronisatie-mappen geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Geen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Recente wijzigingen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Open %1 map</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Beheerde mappen:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Open map '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Quota worden berekend ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Onbekende status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Instellingen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Details ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Help</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>%1 afsluiten</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Inloggen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Uitloggen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Quota niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% van %2 gebruikt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 4e60208..d7f56cf 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Wstrzymaj</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Uwaga:</b> Niektóre foldery, włączając podłączone w sieci lub współdzielone mogą mieć różne limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Wznów</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Potwierdź usunięcie katalogu</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Potwierdź reset folderu </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 z %2 (%3%) w użyciu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Obecnie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Całkowicie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Brak połączenia do %1 w <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Połączenie nie powiodło się</translation>
</message>
@@ -442,95 +442,95 @@
<translation>Nie można utworzyć kontekstu csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Plik %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>Pobrane</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>Usunęte</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>zaktualizowane</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>Zmienione</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>przeniesione</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 do %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' został %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Pliki %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' i %2 inne pliki zostały %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Wprowadź hasło</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Proszę podać %1 hasło dla użytkownika '%2':</translation>
</message>
@@ -1386,25 +1386,33 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1412,42 +1420,42 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Nie mogę usunąć katalogu %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Plik został usunięty z udziału tylko do odczytu. Plik został przywrócony.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1456,16 +1464,26 @@ Niezalecane jest jego użycie.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1620,114 +1638,109 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Szczegóły certyfikatu</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Nazwa (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Alternatywna nazwa tematu:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organizacja (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Jednostka organizacyjna (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Województwo </translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Kraj:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Numer seryjny:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Wystawca</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Emitent:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Data wydania:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Wygasa:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Odciski palców</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (własnoręcznie podpisany)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>o połączenie jest szyfrowane przy użyciu %1 bit %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Informacje Certyfikatu:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>To połączenie NIE jest bezpieczne, ponieważ jest nieszyfrowane.
@@ -1832,117 +1845,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Proszę się zalogować</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Folder %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Nie skonfigurowano synchronizowanych folderów.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Brak.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Ostatnie zmiany</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Otwórz folder %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Zarządzane foldery:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Otwórz katalog '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Obliczam quote...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Nieznany status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Ustawienia...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Szczegóły...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Wyjdź %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Loguję...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Wyloguj</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Quota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 w użyciu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index c036dfc..075f7a6 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pausa</translation>
</message>
@@ -119,102 +119,102 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Confirme a remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>A sincronização está a decorrer</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Iniciar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Actualmente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>A ligação falhou</translation>
</message>
@@ -443,95 +443,95 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 devia de ser um directório mas não é</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Ficheiro %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>removido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>actualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>renomeado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Ficheiros %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -710,7 +710,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="252"/>
<source>Enter the name of the new folder:</source>
- <translation type="unfinished"/>
+ <translation>Introduza o nome da nova pasta:</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="274"/>
@@ -788,7 +788,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/generalsettings.ui" line="66"/>
<source>Updates</source>
- <translation type="unfinished"/>
+ <translation>Actualizações</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="91"/>
@@ -799,12 +799,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Introduza a Palavra-passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1069,7 +1069,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/updater/ocupdater.cpp" line="55"/>
<source>New Update Ready</source>
- <translation type="unfinished"/>
+ <translation>Nova actualização disponível</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="56"/>
@@ -1080,7 +1080,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="77"/>
<source>Downloading version %1. Please wait...</source>
- <translation type="unfinished"/>
+ <translation>A transferir a versão %1. Por favor aguarde...</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="79"/>
@@ -1095,7 +1095,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="83"/>
<source>Could not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Não foi possível verificar por novas actualizações.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
@@ -1384,86 +1384,104 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
- <translation type="unfinished"/>
+ <translation>A sincronização foi cancelada pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
- <translation type="unfinished"/>
+ <translation>Não foi possível criar a directoria %1</translation>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
- <translation type="unfinished"/>
+ <translation>Não foi possível remover a directoria %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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"/>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1617,113 +1635,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
- <translation type="unfinished"/>
+ <translation><h3>Detalhes do Certificado</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
- <translation type="unfinished"/>
+ <translation>Nome Comum (NC):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
- <translation type="unfinished"/>
+ <translation>Organização (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Estado/Distrito:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>País:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
- <translation type="unfinished"/>
+ <translation>Serial:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Expira em:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
- <translation type="unfinished"/>
+ <translation><p><b>Nota:</b> Este certificado foi aprovado manualmente</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1827,117 +1840,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Nenhuma pasta de sincronização configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Alterações recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Abrir a pasta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Pastas Geridas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>A calcular quota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Estado desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Entrar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 264503a..dd3e8af 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Nota:</b> Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Resumir</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Confirma remoção da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Confirme Reiniciar Pasta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Sem %1 conexão configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Sincronização acontecendo</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 de %2 (%3%) em uso.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Iniciar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Atualmente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Completamente</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Nenhuma conexão para %1 at <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<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>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Conexão falhou</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Não é possível criar csync-contexto</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 deveria ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Arquivo %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>baixado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>removido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>atualizado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>renomeado</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>movido</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' foi %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Arquivos %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' e %2 outros arquivos foram %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -802,12 +802,12 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Entrar Senha</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor entrar %1 senha para o usuário '%2':</translation>
</message>
@@ -1388,25 +1388,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar diretório %1</translation>
</message>
@@ -1414,42 +1422,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>O diretório %1 não pode ser removido</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>O arquivo foi removido de um compartilhamento somente de leitura. O arquivo foi restaurado.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Um arquivo foi removido de um compartilhamento de somente leitura, mas a restauração falhou: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1458,16 +1466,26 @@ It is not advisable to use it.</source>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1623,114 +1641,109 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3> Detalhes do Certificado </h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Nome Comum (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Assunto Nomes Alternativos:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organização (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Unidade Organizacional (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Estado/Província</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>País:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Série:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Emissor</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Emissor:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Emitido em:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Expira em:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Impressões Digitais</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b> Nota:</b>Este certificado foi aprovado manualmente</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (em Root loja CA)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (auto-assinado)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Esta conexão é criptografada usando %1 bit %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Informações do certificado:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Esta conexão não é segura, uma vez que não é criptografada.
@@ -1835,117 +1848,117 @@ Certifique-se que sua conexão de rede está funcionando.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Favor conectar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Pastas de sincronização não configuradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Nenhum.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Alterações Recentes</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Abrir pasta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Pastas Gerenciadas:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Calculando cota...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Status desconhecido</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Sair %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Conectar em...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Cota n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% de %2 em uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index c12f6d8..726b14a 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Заметьте:</b> Некоторые папки, включая сетевые или общие, могут иметь разные ограничения.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Продолжить</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Подтвердите удаление папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Подтвердить сброс папки</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 из %2 (%3%) использовано.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Начать</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Сейчас</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Полностью</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation>Полностью завершено.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Нет связи с %1 по адресу <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Сбой подключения</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Невозможно создать контекст csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 должен быть каталогом, но не является таковым.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Файл %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>скачано</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>удалено</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>обновлено</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>переименовано</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>перемещено</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 в %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>%1' был %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Файлы %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' и ещё %2 других файлов было %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -801,12 +801,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Введите пароль</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Пожалуйста введите пароль от %1 для пользователя '%2':</translation>
</message>
@@ -1390,25 +1390,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>не удалось создать директорию %1</translation>
</message>
@@ -1416,42 +1424,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Невозможно удалить директорию %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Файл был удалён из опубликованной папки с правами только для чтения. Файл был восстановлен.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Файл был удалён из опубликованной папки с правами только для чтения, но восстановить его не удалось: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Локальный файл изменился в процессе синхронизации, повторяем процесс</translation>
</message>
@@ -1460,16 +1468,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1625,114 +1643,109 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Детали сертефиката</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Общее имя (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Альтернативное имя субьекта:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Огранизация(О):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Организационное подразделение(OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Область/район:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Страна:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Серия:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Издатель</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Издатель:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Выдан для:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Истекает:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3> Отпечатки пальцев </ h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b> Примечание: </b> Этот сертификат был одобрен вручную </p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (in Root CA store)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (самозаверяющий)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Это соединение зашифровано %1-битным %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Информация сертификата :</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Эта ссылка НЕ зашифрована.
@@ -1837,117 +1850,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Пожалуйста войдите в учётную запись</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Папка %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Нет папок для синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Пусто</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Недавние изменения</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Открыть %1 папку</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Управляемые папки:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Открыть папку '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Расчёт квоты...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Неизвестный статус</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Настройки...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Детали...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Помощь</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Выход %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Войти...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Квота недоступна</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>Используется %1% из %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="430"/>
<source>Syncing %1 of %2 (%3 of %4) </source>
<translation>Синхронизируются %1 из %2 (%3 из %4) </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index c93a3e6..b3cd6b7 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Pauza</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Poznámka:<b> Niektoré priečinky, zahŕňajúc sieťové alebo zdieľané, môžu mať odlišné limity.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Obnovenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdiť odstránenie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdiť resetovanie priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Nenastavený žiaden účet.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 of %2 (%3%) v používaní.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Štart</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Aktuálne</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Úplne</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Žiadne pripojenie k %1 at <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<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>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Spojenie zlyhalo</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Nemožno vytvoriť "csync-kontext"</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokálny priečinok %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 by mal byť priečinok, avšak nie je.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Súbor %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>stiahnuté</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>zmazané</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>aktualizované</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>premenované</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>presunuté</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 na %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' bol %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Súbory %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' a %2 ďalších súborov bolo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -801,12 +801,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Vložte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation>
</message>
@@ -1388,25 +1388,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>nepodarilo sa vytvoriť priečinok %1</translation>
</message>
@@ -1414,42 +1422,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Nemožno odstrániť priečinok %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1458,16 +1466,26 @@ It is not advisable to use it.</source>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1622,113 +1640,108 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Krajina:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1832,117 +1845,117 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Prihláste sa prosím</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Priečinok %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<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="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Žiaden.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Nedávne zmeny</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Otvoriť %1 priečinok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Spravované priečinky:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Otvoriť priečinok '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Otvoriť %1 v prehliadači</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Počítanie kvóty...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Neznámy stav</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Nastavenia...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Detaily...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Ukončiť %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Prihlásiť</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Odhlásiť</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Kvóta n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% z %2 sa používa</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Až do dnešného dňa</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index a904a8b..60cb883 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Premor</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Opomba:</b> nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Nadaljuj</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Potrdi odstranitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Potrdi ponastavitev mape</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljenih %1 povezav.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 od %2 (%3%) v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Začni</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Trenutno</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>V celoti</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>Povezava z %1 ni vzpostavljena pri <a href="%1">%2</a>.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Povezava je spodletela</translation>
</message>
@@ -442,79 +442,79 @@
<translation>Ni mogoče ustvariti vsebine csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bi morala biti mapa, vendar ni.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Datoteka %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>prejeta.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>odstranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>posodobljena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>preimenovana.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>premaknjeno</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 vo %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>Datoteka '%1' je %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Datoteke %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' in %2 drugih datotek je %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -801,12 +801,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Vnos gesla</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation>
</message>
@@ -1390,25 +1390,33 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>ni mogoče ustvariti mape %1</translation>
</message>
@@ -1416,42 +1424,42 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>ni mogoče odstraniti mape %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Datoteka je bila odstranjena iz mesta v souporabi, vendar je uspešno obnovljena.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Datoteka je bila odstranjena iz mesta v souporabi, ki je nastavljena le za branje, obnavljanje pa je spodletelo: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1460,16 +1468,26 @@ Uporaba ni priporočljiva.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1625,114 +1643,109 @@ Prepričajte se, da je omrežna povezava omogočena in delujoča.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Podrobnosti potrdila</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Splošno ime (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Druga imena:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Ustanova (U):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Organizacijska enota (OE):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Okraj:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Država:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Zaporedna številka:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Izdaljatelj</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Izdaljatelj:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Izdano na:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Poteče na:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Prstni odtisi</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Opomba:</b> to potrdilo je bilo ročno odobreno</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (v korenski hrambi CA)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (samopodpisano)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Ta povezava je šifrirana z %1 bitnim %2.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Podrobnosti potrdila:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Ta povezava NI varna, saj ni šifrirana.
@@ -1837,117 +1850,117 @@ Prepričajte se, da je omrežna povezava omogočena in delujoča.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Pred nadaljevanjem je zahtevana prijava</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Mapa %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Brez</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Nedavne spremembe</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Odpri %1 mapo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Upravljane mape:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Odpri mapo '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Preračunavanje količinske omejitve ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Neznano stanje</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Nastavitve ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Podrobnosti ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Pomoč</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Končaj %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Prijava ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Količinska omejitev ni na voljo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 904d407..8b72ba2 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Paus</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Notera:</b> Vissa mappar, inklusive nätverksmonterade eller delade mappar, kan ha olika begränsningar</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Återuppta</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Bekräfta radering av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Bekräfta återställning av mapp</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <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="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Fullständigt</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -442,79 +442,79 @@
<translation>Kan inte skapa csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Den lokala mappen %1 finns inte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ska vara en mapp, men är inte det.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Fil %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -801,12 +801,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1388,25 +1388,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1414,42 +1422,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>Kunde ej ta bort mappen %1</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1458,16 +1466,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1621,113 +1639,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Land:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1831,117 +1844,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Mapp %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Ingen synkroniseringsmapp är konfigurerad.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Ingen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Senaste ändringar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Öppna %1 mappen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Hanterade mappar:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>Öppna mapp '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Beräknar kvot...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Okänd status</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Inställningar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Detaljer...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Hjälp</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>Avsluta %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Kvot n/a</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>%1% av %2 används</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index c4d4ee6..d0a9d1f 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>หยุดชั่วคราว</translation>
</message>
@@ -119,102 +119,102 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>ดำเนินการต่อ</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>ยืนยันการลบโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -442,95 +442,95 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1383,25 +1383,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1409,42 +1417,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1453,16 +1461,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1616,113 +1634,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>ประเทศ:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1826,117 +1839,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>เปิดโฟลเดอร์ %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>ช่วยเหลือ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 8df941e..c0438d7 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Пауза</translation>
</message>
@@ -119,102 +119,102 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Відновлення</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Підтвердіть видалення каталогу</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -442,95 +442,95 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 повинна бути текою, але нею не є.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1383,25 +1383,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1409,42 +1417,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1453,16 +1461,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1616,113 +1634,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Країна:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1826,117 +1839,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Жодна тека не налаштована для синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>Відкрити %1 каталог</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Керовані теки:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Допомога</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 6f0a066..ce3eaf3 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>暂停</translation>
</message>
@@ -119,102 +119,102 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>继续</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>确认移除文件夹</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>同步正在运行</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>开始</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>当前地</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>完整地</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation>完全结束。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -442,95 +442,95 @@
<translation>不能生成 csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 应为目录但并不是。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1383,25 +1383,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1409,42 +1417,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>文件只读共享已取消，文件恢复完毕</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>一个文件已经解除只读共享，但是恢复失败: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1453,16 +1461,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1616,113 +1634,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>国家：</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1826,117 +1839,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>文件夹 %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>没有已配置的同步文件夹。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>打开 %1 目录</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>管理的文件夹：</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>更新</translation>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 3dba352..236955c 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>暫停</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>注意:</b> 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>繼續</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>確認移除資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>資料夾重設確認</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<source>No %1 connection configured.</source>
<translation>無%1連線設定</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>同步中</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>啟動</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>目前</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>完成</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="665"/>
<source>Completely finished.</source>
<translation>完成結束。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<source>%1 of %2, file %3 of %4</source>
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation type="unfinished"/>
</message>
@@ -442,95 +442,95 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -798,12 +798,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1383,25 +1383,33 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1409,42 +1417,42 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1453,16 +1461,26 @@ It is not advisable to use it.</source>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="157"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="242"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1616,113 +1634,108 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>國家：</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation type="unfinished"/>
@@ -1826,117 +1839,117 @@ Please ensure that your network connection is working.</source>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>資料夾 %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>尚未指定同步資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>開啟%1資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>管理的資料夾:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>說明</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>最新的</translation>
</message>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 81d13e0..8a8a7e6 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -89,7 +89,7 @@
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="62"/>
- <location filename="../src/mirall/accountsettings.cpp" line="132"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="138"/>
<source>Pause</source>
<translation>Beklet</translation>
</message>
@@ -119,102 +119,102 @@
<translation><b>Not:</b> Ağa bağlanmış veya paylaşılan klasörler gibi klasörler, farklı sınırlara sahip olabilirler.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="134"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="140"/>
<source>Resume</source>
<translation>Devam et</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="286"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="293"/>
<source>Confirm Folder Remove</source>
<translation>Klasör Kaldırma İşlemini Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="287"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="294"/>
<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="323"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="330"/>
<source>Confirm Folder Reset</source>
<translation>Klasör Sıfırlamayı Onayla</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="324"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="331"/>
<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="768"/>
+ <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"/>
<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="427"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="434"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="102"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="103"/>
<source>No account configured.</source>
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="428"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="435"/>
<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="722"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>%1 of %2 (%3%) in use.</source>
<translation>%1 / %2 (%%3) kullanımda.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="761"/>
<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="598"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="605"/>
<source>Start</source>
<translation>Başlat</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="607"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="614"/>
<source>Currently</source>
<translation>Geçerli</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="615"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>Completely</source>
<translation>Tam olarak</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="655"/>
+ <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="658"/>
+ <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="665"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="672"/>
<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="757"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<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="761"/>
- <source>No connection to %1 at <a href="%1">%2</a>.</source>
- <translation>%1 bağlantısı <a href="%1">%2</a> üzerinde yok.</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="726"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="733"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
@@ -222,7 +222,7 @@
<context>
<name>Mirall::Application</name>
<message>
- <location filename="../src/mirall/application.cpp" line="288"/>
+ <location filename="../src/mirall/application.cpp" line="314"/>
<source>Connection failed</source>
<translation>Bağlantı başarısız</translation>
</message>
@@ -442,79 +442,79 @@
<translation>csync-context oluşturma başarısız</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 yerel klasörü mevcut değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bir dizin olmalıdır ancak değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="163"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>File %1</source>
<translation>Dosya %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="367"/>
+ <location filename="../src/mirall/folder.cpp" line="369"/>
<source>downloaded</source>
<translation>indirildi</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="368"/>
+ <location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>kaldırıldı</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="369"/>
+ <location filename="../src/mirall/folder.cpp" line="371"/>
<source>updated</source>
<translation>güncellendi</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="372"/>
+ <location filename="../src/mirall/folder.cpp" line="374"/>
<source>renamed</source>
<translation>adlandırıldı</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="377"/>
+ <location filename="../src/mirall/folder.cpp" line="379"/>
<source>moved</source>
<translation>taşındı</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="379"/>
+ <location filename="../src/mirall/folder.cpp" line="381"/>
<source>%1 to %2</source>
<translation>%1 ile %2 arası</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="392"/>
+ <location filename="../src/mirall/folder.cpp" line="394"/>
<source>'%1' has been %2.</source>
<translation>'%1' %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="394"/>
+ <location filename="../src/mirall/folder.cpp" line="396"/>
<source>Files %1</source>
<translation>Dosya %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="395"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>'%1' and %2 other files have been %3.</source>
<translation>'%1' ve diğer %2 dosya %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="689"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<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="692"/>
+ <location filename="../src/mirall/folder.cpp" line="694"/>
<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>
@@ -523,17 +523,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="696"/>
+ <location filename="../src/mirall/folder.cpp" line="698"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="699"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -801,12 +801,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="244"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="265"/>
<source>Enter Password</source>
<translation>Parolayı Girin</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="245"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="266"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation>
</message>
@@ -1389,25 +1389,33 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<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="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket altık. Sonraki işlemde yeniden denenecek.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateItemJob</name>
+ <message>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="134"/>
+ <source>A file or directory was removed from a read only share, but restoring failed: %1</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="157"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
<translation>%1 dizini oluşturulamadı</translation>
</message>
@@ -1415,42 +1423,42 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="133"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
<source>Could not remove directory %1</source>
<translation>%1 dizini kaldırılamadı</translation>
</message>
</context>
<context>
- <name>Mirall::PropagateNeonJob</name>
+ <name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="98"/>
- <source>The file was removed from a read only share. The file has been restored.</source>
- <translation>Dosya salt okunur bir paylaşımdan kaldırılmıştı. Dosya geri yüklendi.</translation>
- </message>
- <message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="100"/>
- <source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation>Dosya bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="130"/>
+ <source>The file has been removed from a read only share. It was restored.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="215"/>
<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="261"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<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"/>
+ <source>The file was renamed but is part of a read only share. The original file was restored.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="203"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<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>
@@ -1459,16 +1467,26 @@ Kullanmanız önerilmez.</translation>
<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"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="197"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <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="204"/>
<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="242"/>
+ <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>
@@ -1624,114 +1642,109 @@ Lütfen ağ bağlantınızın çalıştığından emin olun.</translation>
<context>
<name>Mirall::SslButton</name>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="94"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="95"/>
<source><h3>Certificate Details</h3></source>
<translation><h3>Sertifika Ayrıntıları</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="97"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Common Name (CN):</source>
<translation>Ortam Ad (CN):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="98"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="99"/>
<source>Subject Alternative Names:</source>
<translation>Konu Alternatif İsimleri:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="100"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organization (O):</source>
<translation>Organizasyon (O):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="101"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>Organizational Unit (OU):</source>
<translation>Organizasyon Birimi (OU):</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="102"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="103"/>
<source>State/Province:</source>
<translation>Bölge/İlçe:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="103"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="104"/>
<source>Country:</source>
<translation>Ülke:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="104"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="105"/>
<source>Serial:</source>
<translation>Seri No:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="107"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="108"/>
<source><h3>Issuer</h3></source>
<translation><h3>Yayıncı</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="110"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issuer:</source>
<translation>Yayıncı:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="111"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Issued on:</source>
<translation>Yayınlanma:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="112"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="113"/>
<source>Expires on:</source>
<translation>Bitiş:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="115"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="116"/>
<source><h3>Fingerprints</h3></source>
<translation><h3>Parmak İzleri</h3></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="118"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
<translation>MD 5:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="119"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
<translation>SHA-1:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="123"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
<translation><p><b>Not:</b> Bu sertifika el ile onaylandı</p></translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="140"/>
- <source>%1 (in Root CA store)</source>
- <translation>%1 (Kök CA deposunda)</translation>
- </message>
- <message>
- <location filename="../src/mirall/sslbutton.cpp" line="143"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="144"/>
<source>%1 (self-signed)</source>
<translation>%1 (kendinden imzalı)</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="145"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="146"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="176"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="177"/>
<source>This connection is encrypted using %1 bit %2.
</source>
<translation>Bu bağlantı %1 bit %2 kullanılarak şifrelenmiştir.
</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="179"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="180"/>
<source>Certificate information:</source>
<translation>Sertifika bilgisi:</translation>
</message>
<message>
- <location filename="../src/mirall/sslbutton.cpp" line="204"/>
+ <location filename="../src/mirall/sslbutton.cpp" line="209"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
<translation>Bu bağlantı şifrelenmediğinden güvenli DEĞİL.
@@ -1836,117 +1849,117 @@ Lütfen ağ bağlantınızın çalıştığından emin olun.</translation>
<context>
<name>Mirall::ownCloudGui</name>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="171"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="165"/>
<source>Please sign in</source>
<translation>Lütfen oturum açın</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="197"/>
<source>Folder %1: %2</source>
<translation>Klasör %1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="203"/>
<source>No sync folders configured.</source>
<translation>Eşitleme dizini yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
<source>None.</source>
<translation>Hiçbiri.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="232"/>
<source>Recent Changes</source>
<translation>Son Değişiklikler</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="255"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="249"/>
<source>Open %1 folder</source>
<translation>%1 dizinini aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="265"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="259"/>
<source>Managed Folders:</source>
<translation>Yönetilen dizinler:</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="268"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="262"/>
<source>Open folder '%1'</source>
<translation>'%1' klasörünü aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="338"/>
<source>Open %1 in browser</source>
<translation>%1'ı tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="346"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
<source>Calculating quota...</source>
<translation>Kota hesaplanıyor...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="348"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="342"/>
<source>Unknown status</source>
<translation>Bilinmeyen durum</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="344"/>
<source>Settings...</source>
<translation>Ayarlar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="351"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="345"/>
<source>Details...</source>
<translation>Ayrıntılar...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="356"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="350"/>
<source>Help</source>
<translation>Yardım</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="358"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="352"/>
<source>Quit %1</source>
<translation>%1'tan Çık</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="355"/>
<source>Sign in...</source>
<translation>Oturum aç...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="363"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="357"/>
<source>Sign out</source>
<translation>Oturumu kapat</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="373"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
<source>Quota n/a</source>
<translation>Kota kullanılamıyor</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="380"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="372"/>
<source>%1% of %2 in use</source>
<translation>% %1 kullanılıyor. Toplam: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="401"/>
+ <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="410"/>
+ <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="438"/>
+ <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>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="452"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list