[Pkg-owncloud-commits] [owncloud-client] 07/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:27 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 e36d314218f1e843e208546180213fd7ec2deb52
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Sat Feb 8 01:26:49 2014 -0500
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 49 ++++++++++-----------
translations/mirall_cs.ts | 102 +++++++++++++++++++++----------------------
translations/mirall_de.ts | 57 +++++++++++-------------
translations/mirall_el.ts | 49 ++++++++++-----------
translations/mirall_en.ts | 49 ++++++++++-----------
translations/mirall_es.ts | 57 +++++++++++-------------
translations/mirall_es_AR.ts | 49 ++++++++++-----------
translations/mirall_et.ts | 65 +++++++++++++--------------
translations/mirall_eu.ts | 49 ++++++++++-----------
translations/mirall_fa.ts | 49 ++++++++++-----------
translations/mirall_fi.ts | 49 ++++++++++-----------
translations/mirall_fr.ts | 49 ++++++++++-----------
translations/mirall_gl.ts | 57 +++++++++++-------------
translations/mirall_hu.ts | 49 ++++++++++-----------
translations/mirall_it.ts | 49 ++++++++++-----------
translations/mirall_ja.ts | 57 +++++++++++-------------
translations/mirall_nl.ts | 59 ++++++++++++-------------
translations/mirall_pl.ts | 49 ++++++++++-----------
translations/mirall_pt.ts | 49 ++++++++++-----------
translations/mirall_pt_BR.ts | 57 +++++++++++-------------
translations/mirall_ru.ts | 62 ++++++++++++--------------
translations/mirall_sk.ts | 49 ++++++++++-----------
translations/mirall_sl.ts | 65 +++++++++++++--------------
translations/mirall_sv.ts | 49 ++++++++++-----------
translations/mirall_th.ts | 49 ++++++++++-----------
translations/mirall_uk.ts | 49 ++++++++++-----------
translations/mirall_zh_CN.ts | 49 ++++++++++-----------
translations/mirall_zh_TW.ts | 49 ++++++++++-----------
translations/pofiles/tr.po | 57 +++++++++++-------------
29 files changed, 718 insertions(+), 859 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 94f5252..a93a620 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -513,19 +513,14 @@
<translation>'%1' i %2 altres fitxers s'han %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Error</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -812,12 +807,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Escriviu contrasenya</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Versió nova disponible</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Hi ha una versió nova del client %1.</p><p><b>%2</b> disponible per baixar. La versió instal·lada és %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Omet aquesta vegada</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Obtén l'actialització</translation>
</message>
@@ -1399,17 +1394,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>L'usuari ha aturat la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1446,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1460,7 +1455,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1595,22 +1590,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticat</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Error en carregar la pàgina d'acreditació IdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>No s'ha pogut carregar la pàgina d'acreditació per acreditar-vos.
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 2a0b80c..3556877 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Zvolte vzdálenou cílovou složku</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -513,19 +513,14 @@
<translation> '%1' a %2 dalších souborů bylo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Chyba</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -806,18 +801,18 @@ Opravdu chcete provést tuto akci?</translation>
<message>
<location filename="../src/mirall/generalsettings.ui" line="91"/>
<source>&Restart && Update</source>
- <translation type="unfinished"/>
+ <translation>&Restart && aktualizace</translation>
</message>
</context>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Zadejte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation>
</message>
@@ -871,12 +866,12 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="128"/>
<source>Edit Ignore Pattern</source>
- <translation type="unfinished"/>
+ <translation>Upravit masku ignorovaných</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="129"/>
<source>Edit ignore pattern:</source>
- <translation type="unfinished"/>
+ <translation>Upravit masku ignorovaných:</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="140"/>
@@ -953,27 +948,27 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Je dostupná nová verze</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Je k dispozici nová verze klienta %1.</p><p><b>%2</b> je k dispozici ke stažení. Aktuálně nainstalovaná verze je %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Přeskoč tuto verzi</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Tentokrát přeskočit</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Získat aktualizaci</translation>
</message>
@@ -1106,12 +1101,12 @@ si může v průběhu vyžádat dodatečná práva.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="81"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
- <translation type="unfinished"/>
+ <translation>Nemohu stáhnout aktualizaci. Klikněte, prosím, na <a href='%1'>tento odkaz</a> pro manuální stažení.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="83"/>
<source>Could not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Nemohu zkontrolovat aktualizace.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
@@ -1126,7 +1121,7 @@ si může v průběhu vyžádat dodatečná práva.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="91"/>
<source>No updates available. Your installation is at the latest version.</source>
- <translation type="unfinished"/>
+ <translation>Žádne aktualizace nejsou k dispozici. Používáte aktuální verzi.</translation>
</message>
</context>
<context>
@@ -1222,7 +1217,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="223"/>
<source>Could not connect securely. Do you want to connect unencrypted instead (not recommended)?</source>
- <translation type="unfinished"/>
+ <translation>Nemohu se připojit zabezpečeně. Přejete si místo toho připojit nezabezpečeně (nedoporučuje se)? </translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="224"/>
@@ -1401,17 +1396,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/brány</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1448,12 +1443,12 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1462,7 +1457,7 @@ Nedoporučuje se jí používat.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Místní soubor byl změněn během synchronizace, bude sesynchronizán, jakmile bude kompletní</translation>
</message>
@@ -1599,22 +1594,22 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - ověření</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Chyba při načítání přihlašovací stránky IdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Nemohu načíst přihlašovací stránku Shibboleth potřebnou pro přihlášení.
@@ -1626,32 +1621,32 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="94"/>
<source><h3>Certificate Details</h3></source>
- <translation type="unfinished"/>
+ <translation><h3>Detaily certifikátu</h3></translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="97"/>
<source>Common Name (CN):</source>
- <translation type="unfinished"/>
+ <translation>Běžný název (CN):</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="98"/>
<source>Subject Alternative Names:</source>
- <translation type="unfinished"/>
+ <translation>Alternativní jména subjektu:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="100"/>
<source>Organization (O):</source>
- <translation type="unfinished"/>
+ <translation>Organizace (O):</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="101"/>
<source>Organizational Unit (OU):</source>
- <translation type="unfinished"/>
+ <translation>Organizační jednotka (OU):</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="102"/>
<source>State/Province:</source>
- <translation type="unfinished"/>
+ <translation>Stát/provincie</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="103"/>
@@ -1666,22 +1661,22 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="107"/>
<source><h3>Issuer</h3></source>
- <translation type="unfinished"/>
+ <translation><h3>Vydavatel</h3></translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="110"/>
<source>Issuer:</source>
- <translation type="unfinished"/>
+ <translation>Vydavatel:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="111"/>
<source>Issued on:</source>
- <translation type="unfinished"/>
+ <translation>Vydáno:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="112"/>
<source>Expires on:</source>
- <translation type="unfinished"/>
+ <translation>Platný do:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="115"/>
@@ -1691,17 +1686,17 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="118"/>
<source>MD 5:</source>
- <translation type="unfinished"/>
+ <translation>MD5:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>SHA-1:</source>
- <translation type="unfinished"/>
+ <translation>SHA-1:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="123"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
- <translation type="unfinished"/>
+ <translation><p><b>Poznánka:</b> Tento certifikát byl schválen manuálně</p></translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="137"/>
@@ -1711,7 +1706,7 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="140"/>
<source>%1 (self-signed)</source>
- <translation type="unfinished"/>
+ <translation>%1 (podepsaný sám sebou)</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="142"/>
@@ -1722,18 +1717,21 @@ Ujistěte se, prosím, že síťové spojení funguje.</translation>
<location filename="../src/mirall/sslbutton.cpp" line="173"/>
<source>This connection is encrypted using %1 bit %2.
</source>
- <translation type="unfinished"/>
+ <translation>Toto spojení je šifrováno pomocí %1 bitové šifry
+
+</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="176"/>
<source>Certificate information:</source>
- <translation type="unfinished"/>
+ <translation>Informace o certifikátu:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="201"/>
<source>This connection is NOT secure as it is not encrypted.
</source>
- <translation type="unfinished"/>
+ <translation>Toto spojení NENÍ bezpečná, protože není šifrovaná.
+</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 0fc1962..7d1a6a8 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -374,12 +374,12 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>CSync konnte den Synchronisationsbericht nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte auf das lokale Synchronisationsverzeichnis haben.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>CSync konnte den Synchronisationsbericht nicht schreiben.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -514,19 +514,14 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>'%1' und %2 andere Dateien wurden %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Fehler</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -535,17 +530,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -813,12 +808,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="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Passwort eingeben</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation>
</message>
@@ -954,27 +949,27 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Eine neue Version ist verfügbar.</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Eine neue Version des %1-Clients ist verfügbar.</p><p>Version <b>%2</b> steht zum Download bereit. Die zur Zeit installierte Version: %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Diese Version auslassen</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Dieses Mal überspringen</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Update durchführen</translation>
</message>
@@ -1402,17 +1397,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1422,12 +1417,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Eine Datei wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation>
</message>
</context>
<context>
@@ -1449,12 +1444,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1463,7 +1458,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1599,22 +1594,22 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Authentifikation</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Fehler beim laden der IdP-Anmeldeseite</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Shibboleth-Anmeldeseite konnte nicht geladen werden.
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index f31e996..ed2589b 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -513,19 +513,14 @@
<translation>Τα '%1' και άλλα %2 αρχεία %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Σφάλμα</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -812,12 +807,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Νέα Εκδοχή Διαθέσιμη </translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation>Μια νέα εκδοχή του Δέκτη %1 είναι διαθέσιμη. </p><p><b>%2</b>είναι διαθέσιμη για άνοιγμα. Η εγκατεστημένη εκδοχή είναι %3,<p>. </translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Παράλειψη αυτή τη φορά</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Λάβετε την ενημέρωση </translation>
</message>
@@ -1399,17 +1394,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1446,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε το ξανά Κοινόχρηστος.</translation>
</message>
@@ -1460,7 +1455,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού, θα συγχρονιστεί και πάλι όταν φτάσει πλήρως</translation>
</message>
@@ -1596,22 +1591,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Πιστοποίηση</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Σφάλμα κατά τη φόρτωση της σελίδας σύνδεσης IdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Δεν ήταν δυνατή η φόρτωση της σελίδας σύνδεσης Shibboleth.
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 803f44b..bdc8b61 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -515,35 +515,30 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -811,12 +806,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"></translation>
</message>
@@ -950,27 +945,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation type="unfinished"></translation>
</message>
@@ -1396,17 +1391,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
@@ -1443,12 +1438,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
@@ -1457,7 +1452,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"></translation>
</message>
@@ -1592,22 +1587,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"></translation>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 6d438b4..f0d84a5 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -373,12 +373,12 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>CSync falló al escribir el archivo de diario.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -513,19 +513,14 @@
<translation>'%1' y %2 otros archivos son %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Error</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -812,12 +807,12 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Introduzca la Contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, introduzca su %1 contraseña para el usuario '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nueva versión disponible</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Una nueva versión del cliente %1 está disponible.</p><p><b>%2</b> está disponible para descarga. La versión instalada es la %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Saltarse esta versión</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Omitir esta vez</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Actualizar</translation>
</message>
@@ -1401,17 +1396,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>La sincronización ha sido Interrumpida por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1421,12 +1416,12 @@ No se recomienda usarlo.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>El archivo fue retirado de una carpeta compartida en modo de solo lectura. El archivo ha sido restaurado.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Un archivo fue retirado de una carpeta compartida en modo de solo lectura, pero su restauración falló: %1</translation>
</message>
</context>
<context>
@@ -1448,12 +1443,12 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1462,7 +1457,7 @@ No se recomienda usarlo.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1598,22 +1593,22 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticar</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Error cargando la página de login</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>No puedo cargar la página de login, para que se pueda loguear.
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index f7f603b..b9134e1 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -513,19 +513,14 @@
<translation>'%1' y %2 otros archivos han sido %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Error</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -812,12 +807,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="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Ingresar contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nueva versión disponible</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Hay disponible una nueva versión del cliente %1.</p><p><b>%2</b> está disponible para su descarga. La versión instalada es %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Saltear esta vez</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Obtener actualización</translation>
</message>
@@ -1399,17 +1394,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizaciójn abortada por el usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1446,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1460,7 +1455,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1596,22 +1591,22 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticarse</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Error descargando la página de inicio de sesión de ldp</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>No se pudo cargar la página de inicio de sesión de Shibboleth.
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 9e90ca2..1074e25 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Vali eemalolev sihtkaust</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -373,12 +373,12 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>Csync ei suutnud avada või luua registri faili. Tee kindlaks et sul on õigus lugeda ja kirjutada kohalikus sünkrooniseerimise kataloogis</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>CSync ei suutnud luua registri faili.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -513,19 +513,14 @@
<translation>'%1' ja %2 teist faili on olnud %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Viga</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -812,12 +807,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Sisesta parool</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Palun sisesta %1 parool kasutajale '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Saadaval on uuem versioon</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Uus versioon %1 kliendist on saadaval.</p><p><b>%2</b> on saadaval alla laadimiseks. Paigaldatud on versioon %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Jäta see versioon vahele</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Jäta seekord vahele</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Hangi uuendus</translation>
</message>
@@ -1106,12 +1101,12 @@ täiendavaid õigusi protsessi käigus.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="81"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
- <translation type="unfinished"/>
+ <translation>Ei suutnud uuendust alla laadida. Palun klõpsa käsitsi uuenduse alla laadimiseks <a href='%1'>siia</a> %2</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="83"/>
<source>Could not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Uuenduste kontrollimine ebaõnnestus.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
@@ -1126,7 +1121,7 @@ täiendavaid õigusi protsessi käigus.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="91"/>
<source>No updates available. Your installation is at the latest version.</source>
- <translation type="unfinished"/>
+ <translation>Uuendusi pole saadaval. Kasutad kõige viimast versiooni.</translation>
</message>
</context>
<context>
@@ -1401,17 +1396,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1421,12 +1416,12 @@ Selle kasutamine pole soovitatav.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>Fail oli kustutatud kirjutamisõiguseta kataloogist, kuid on nüüd taastatud.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Fail oli eemaldatud kirjutamisõiguseta kataloogist ning taastamine ebaõnnestus: %1</translation>
</message>
</context>
<context>
@@ -1448,12 +1443,12 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1462,7 +1457,7 @@ Selle kasutamine pole soovitatav.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1598,22 +1593,22 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - autentimine</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Viga IdP sisselogimislehe laadimisel</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Ei suuda laadida Shibboleth sisselogimislehte.
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index a49d822..397bcc7 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -513,35 +513,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Errorea</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Sartu Pasahitza</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Bertsio berria eskuragarri</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Utzi aldi honetan</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Eskuratu eguneraketa</translation>
</message>
@@ -1394,17 +1389,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1436,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1455,7 +1450,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1590,22 +1585,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 2d2aa3e..bf1d8cb 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -513,35 +513,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>خطا</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>نسخه جدید در دسترس است</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>یک نسخه جدید از %1 نرم افزار در دسترس است. </p><p><b>%2</b> برای دریافت در دسترس است. نسخه نصب شده %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>نادیده گرفتن این زمان</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>به دست آوردن به روز رسانی</translation>
</message>
@@ -1394,17 +1389,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1436,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1455,7 +1450,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1590,22 +1585,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 5dfa9e9..5de13a8 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -513,35 +513,30 @@
<translation>'%1' ja %2 muuta tiedostoa on %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Virhe</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Anna salasana</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Anna käyttäjän '%2' %1-salasana:</translation>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Uusi versio saatavilla</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Uusi versio %1-asiakassovelluksesta on saatavilla.</p><p><b>%2</b> on valmiina ladattavaksi. Tällä hetkellä asennettu versio on %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Ohita tämä versio</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Ohita tämän kerran</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Päivitä</translation>
</message>
@@ -1395,17 +1390,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1442,12 +1437,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1456,7 +1451,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1591,22 +1586,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Tunnistaudu</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index af0c3f7..badee98 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -513,19 +513,14 @@
<translation>'%1' et %2 autres fichiers ont été %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Erreur</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -812,12 +807,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Entrez le mot de passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nouvelle version disponible</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Une nouvelle version du client de synchronisation %1 est disponible.</p><p><b>%2</b> est disponible au téléchargement. La version installée est %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Ignorer cette version.</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Ignorer pour cette fois</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Obtenir la mise à jour</translation>
</message>
@@ -1401,17 +1396,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>La synchronisation a été interrompue par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1448,12 +1443,12 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1462,7 +1457,7 @@ Il est déconseillé de l'utiliser.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1598,22 +1593,22 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Authentifier</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Erreur pendant le chargement de la page de connexion IdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Impossible de charger la page de connexion Shibboleth pour vous connecter.
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 08ff0e3..338a3ba 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -373,12 +373,12 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>Produciuse un fallo do Csync ao cargar ou crear o ficheiro de rexistro. Asegúrese de que ten permisos de lectura e escritura no directorio de sincronización local.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>Produciuse un fallo en CSync ao escribir o ficheiro de rexistro.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -513,19 +513,14 @@
<translation>«%1» e outros %2 ficheiros foron %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Erro</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -812,12 +807,12 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Escriba o contrasinal</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriba o contrasinal %1 para o usuario «%2»:</translation>
</message>
@@ -953,27 +948,27 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Hai dispoñíbel unha nova versión</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Hai dispoñíbel unha nova versión do cliente %1.</p><p>Pode descargar a versión <b>%2</b>. A versión instalada é a %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Omitir esta versión</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Omitir polo de agora</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Obter a actualización</translation>
</message>
@@ -1401,17 +1396,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>A sincronización foi interrompida polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1421,12 +1416,12 @@ Recomendámoslle que non o use.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>O ficheiro foi retirado da compartición de só lectura. O ficheiro foi restaurado.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Un ficheiro foi retirado da compartición de só lectura, mais a restauración fracasou: %1</translation>
</message>
</context>
<context>
@@ -1448,12 +1443,12 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1462,7 +1457,7 @@ Recomendámoslle que non o use.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1598,22 +1593,22 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticado</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Produciuse un erro ao cargar a páxina de acceso IdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Non foi posíbel cargar a páxina de acceso Shibboleth.
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 0028d32..a9b6f22 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -513,35 +513,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Hiba</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<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="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Új verzió érhető el</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Kihagyás ezalkalommal</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Frissítés beszerzése</translation>
</message>
@@ -1394,17 +1389,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1436,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1455,7 +1450,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1590,22 +1585,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 5ee9e51..0c9127d 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -513,19 +513,14 @@
<translation>'%1' e %2 altri file sono stati %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Errore</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -812,12 +807,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Digita la password</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Digita la password di %1 per l'utente '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nuova versione disponibile</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Una nuova versione del client %1 è disponibile.</p><p><b>%2</b> è disponibile per lo scaricamento. La versione installata è %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Salta questa versione</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Salta questa volta</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Ottieni l'aggiornamento</translation>
</message>
@@ -1400,17 +1395,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun E-Tag ricevuto dal server, controlla il Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1447,12 +1442,12 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1461,7 +1456,7 @@ Non è consigliabile utilizzarlo.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Un file locale è cambiato durante la sincronizzazione, riprova più tardi.</translation>
</message>
@@ -1597,22 +1592,22 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticazione</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Errore durante il caricamento della pagina di accessoIdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Impossibile caricare la pagina di login Shibboleth per autenticarti.
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 3fac412..b4711da 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -513,19 +513,14 @@
<translation>'%1' と %2 個のファイルは %3 です。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>エラー</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -685,7 +680,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configuredfolder is contained in the folder this link is pointing to.</source>
- <translation>選択したフォルダーはシンボリックリンクです。そのリンクの参照先のフォルダーには、既に登録されているフォルダーがあります。</translation>
+ <translation>選択されたフォルダーはシンボリックリンクです。そのリンクの参照先のフォルダーには、すでに登録されているフォルダーがあります。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
@@ -695,7 +690,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="152"/>
<source>The selected folder is a symbolic link. An already configured folder is the parent of the current selected contains the folder this link is pointing to.</source>
- <translation>このフォルダーはシンボリックリンクです。このリンクが指している参照元フォルダーを含んだ親フォルダが既に登録されています。</translation>
+ <translation>選択されたフォルダーはシンボリックリンクです。このリンクが指している参照元フォルダーを含んだ親フォルダがすでに登録されています。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="165"/>
@@ -748,7 +743,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="388"/>
<source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source>
- <translation><i>%1</i>は、<i>%2</i>の親フォルダーで既に同期しています。</translation>
+ <translation><i>%1</i>は、<i>%2</i>の親フォルダーですでに同期しています。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="392"/>
@@ -813,12 +808,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>パスワードを入力してください</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>ユーザー '%2' の %1 パスワードを入力してください:</translation>
</message>
@@ -954,27 +949,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>新しいバージョンが利用可能です</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>%1 クライアントの新しいバージョンが利用可能です。</p><p><b>%2</b> がダウンロード可能です。インストールされているバージョンは %3 です。<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>今回のバージョンをスキップ</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>今回はスキップ</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>アップデートを取得</translation>
</message>
@@ -1321,7 +1316,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="300"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
- <translation>リモートフォルダー %1 は既に存在します。同期のために接続しています。</translation>
+ <translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation>
</message>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
@@ -1400,17 +1395,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシー/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
@@ -1447,12 +1442,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
@@ -1461,7 +1456,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>同期中にローカルファイルが変更されました。完了してからもう一度同期してください。</translation>
</message>
@@ -1597,22 +1592,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - 認証</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>IdP ログインページの読み込みエラー</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Shibboleth ログインページをロードできません。
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index f04a26c..a9e58c6 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Selecteer een externe bestemmingsmap</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -373,12 +373,12 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>CSync kon het journal bestand niet wegschrijven.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -513,19 +513,14 @@
<translation>'%1' en %2 andere bestanden waren %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Fout</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -812,12 +807,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Vul het wachtwoord in</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nieuwe versie beschikbaar</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Er is een nieuwe versie van de %1-client.</p><p><b>%2</b> kan gedownload worden. De geïnstalleerde versie is %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Deze versie overslaan.</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Deze keer overslaan</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Ophalen update</translation>
</message>
@@ -1401,17 +1396,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1421,12 +1416,12 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>Het bestand was verwijderd van een alleen-lezen share. Het bestand is hersteld.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Een bestand is verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation>
</message>
</context>
<context>
@@ -1448,12 +1443,12 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1462,7 +1457,7 @@ We adviseren deze site niet te gebruiken.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1598,22 +1593,22 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - authenticeren</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Fout bij het laden van IdP login pagina</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Kon de Shibboleth loginpagina niet laden om u in te loggen.
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index c121e0f..0c12f98 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -513,35 +513,30 @@
<translation>'%1' i %2 inne pliki zostały %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Błąd</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Wprowadź hasło</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Proszę podać %1 hasło dla użytkownika '%2':</translation>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nowa wersja dostępna</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Nowa wersja klienta %1 jest dostępna.</p><p><b>%2</b>jest dostępna do pobrania. Zainstalowana wersja to %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Pomiń tą wersję</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Pomiń tym razem</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Uaktualnij</translation>
</message>
@@ -1394,17 +1389,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1436,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1455,7 +1450,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1591,22 +1586,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 962c342..2f925dd 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -514,35 +514,30 @@ 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="452"/>
- <source>Error</source>
- <translation>Erro</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -810,12 +805,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -949,27 +944,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nova Versão Disponível</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation type="unfinished"/>
</message>
@@ -1395,17 +1390,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1442,12 +1437,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1456,7 +1451,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1591,22 +1586,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 581048b..1c986e8 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -373,12 +373,12 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>Csync falhou ao carregar ou criar o arquivo jornal. Certifique-se de ter permissão de escrita no diretório de sincronização local.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>Csync falhou ao tentar gravar o arquivo jornal.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -513,19 +513,14 @@
<translation>'%1' e %2 outros arquivos foram %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Erro</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -813,12 +808,12 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Entrar Senha</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor entrar %1 senha para o usuário '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nova Versão Disponínel</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Uma nova versão do Cliente %1 está disponível.</p><p><b>%2</b> está disponível para baixar. A versão instalada é %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Pule esta versão</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Pular desta vêz</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Atualizar</translation>
</message>
@@ -1399,17 +1394,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi abortada pelo usuário.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1419,12 +1414,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>O arquivo foi removido de um compartilhamento somente de leitura. O arquivo foi restaurado.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Um arquivo foi removido de um compartilhamento de somente leitura, mas a restauração falhou: %1</translation>
</message>
</context>
<context>
@@ -1446,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ele será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1460,7 +1455,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1596,22 +1591,22 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticar</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Erro ao carregar página de login IdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Não foi possível carregar a página de login Shibboleth para conectá-lo
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 92e4b28..8814292 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Выберите удалённую папку назначения</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -373,12 +373,12 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>CSync не смог загрузить или создать файл журнала. Убедитесь что вы имеете права чтения и записи в локальной директории.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>CSync не смог записать файл журнала.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -513,19 +513,14 @@
<translation>'%1' и ещё %2 других файлов было %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Ошибка</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -812,12 +807,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Введите пароль</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Пожалуйста введите пароль от %1 для пользователя '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Доступна новая версия</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Новая версия программы-клиента %1 доступна.</p><p><b>%2</b> доступна для скачивания. Установленная версия %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Пропустить эту версию</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Пропустить в этот раз</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Получить обновление</translation>
</message>
@@ -1401,17 +1396,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
@@ -1421,12 +1416,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>Файл был удалён из опубликованной папки с правами только для чтения. Файл был восстановлен.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Файл был удалён из опубликованной папки с правами только для чтения, но восстановить его не удалось: %1</translation>
</message>
</context>
<context>
@@ -1448,12 +1443,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
@@ -1462,7 +1457,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Локальный файл изменился в процессе синхронизации, повторяем процесс</translation>
</message>
@@ -1598,22 +1593,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Авторизация</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Ошибка загрузки страницы входа ldP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Не удалось загрузить страницу входа Shibboleth.
@@ -1721,7 +1716,8 @@ Please ensure that your network connection is working.</source>
<location filename="../src/mirall/sslbutton.cpp" line="173"/>
<source>This connection is encrypted using %1 bit %2.
</source>
- <translation type="unfinished"/>
+ <translation>Это соединение зашифровано %1-битным %2.
+</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="176"/>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 304e214..fb76569 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -513,19 +513,14 @@
<translation>'%1' a %2 ďalších súborov bolo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Chyba</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -812,12 +807,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="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Vložte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation>
</message>
@@ -953,27 +948,27 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Nová verzia je k dispozícii</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Nová verzia %1 klienta je dostupná.</p><p><b>%2</b> je dostupný na stiahnutie. Nainštalovaná verzia je %3.</p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Tentoraz preskočiť</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Aktualizovať teraz</translation>
</message>
@@ -1399,17 +1394,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizácia zrušená používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1446,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1460,7 +1455,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1595,22 +1590,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - overenie</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Chyba pri načítavaní prihlasovacej stránky IdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Nemôžem načítať prihlasovaciu stránku Shibboleth potrebnú pre prihlásenie.
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index d79a5e4..378466a 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -32,7 +32,7 @@
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="128"/>
<source>Select a remote destination folder</source>
- <translation type="unfinished"/>
+ <translation>Izberite oddaljeno ciljno mapo.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
@@ -373,12 +373,12 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana posebna dovoljenja krajevne mape za usklajevanje.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>Zapisovanje dnevniške datoteke s CSync je spodletelo.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -513,19 +513,14 @@
<translation>'%1' in %2 drugih datotek je %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Napaka</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -812,12 +807,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Vnos gesla</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation>
</message>
@@ -953,27 +948,27 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Na voljo je novejša različica</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>Na voljo je nova različica odjemalca %1.</p><p>Datoteka <b>%2</b> je na voljo za prejem. Trenutno je nameščena različica %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Preskoči to različico</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Posodobitev tokrat preskoči</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Pridobi posodobitve</translation>
</message>
@@ -1106,12 +1101,12 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="81"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
- <translation type="unfinished"/>
+ <translation>Ni mogoče prejeti posodobitve. Kliknite <a href='%1'>here</a> za ročni prejem in namestitev.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="83"/>
<source>Could not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Ni mogoče preveriti za nove posodobitve.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
@@ -1126,7 +1121,7 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="91"/>
<source>No updates available. Your installation is at the latest version.</source>
- <translation type="unfinished"/>
+ <translation>Na voljo ni novih posodobitev. Nameščena je najnovejša različica.</translation>
</message>
</context>
<context>
@@ -1401,17 +1396,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1421,12 +1416,12 @@ Uporaba ni priporočljiva.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>Datoteka je bila odstranjena iz mesta v souporabi, vendar je uspešno obnovljena.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Datoteka je bila odstranjena iz mesta v souporabi, ki je le za branje, obnavljanje pa je spodletelo: %1</translation>
</message>
</context>
<context>
@@ -1448,12 +1443,12 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1462,7 +1457,7 @@ Uporaba ni priporočljiva.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1598,22 +1593,22 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Overitev</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>Napaka nalaganja prijavne strani IdP</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Ni mogoče naložiti prijavne strani Shibboleth in izvesti prijave.
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 472a510..39b3a93 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -513,19 +513,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Fel</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -812,12 +807,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="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -953,27 +948,27 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Ny version tillgänglig</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>En ny version av %1 Client är tillgänglig.</p><p><b>%2</b> är tillgänglig för nedladdning. Den installerade versionen är %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Hoppa över denna gång</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Hämta uppdatering</translation>
</message>
@@ -1399,17 +1394,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1446,12 +1441,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna katalog får inte byta namn. Den kommer att döpas om till sitt original namn.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1460,7 +1455,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1595,22 +1590,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 32bcc17..387f065 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -513,35 +513,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>ข้อผิดพลาด</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation type="unfinished"/>
</message>
@@ -1394,17 +1389,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1436,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1455,7 +1450,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1590,22 +1585,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 07b8315..56850fb 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -513,35 +513,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Помилка</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation type="unfinished"/>
</message>
@@ -1394,17 +1389,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1436,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1455,7 +1450,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1590,22 +1585,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index e92977b..8ff697c 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -513,35 +513,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>错误</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>新版本可用</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>新版本的 %1 客户端可用。</p><p><b>%2</b> 已经开放下载。已安装的版本是 %3。<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>本次跳过</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>获取更新</translation>
</message>
@@ -1394,17 +1389,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1436,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1455,7 +1450,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1590,22 +1585,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index dfdbb82..06f9be5 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -513,35 +513,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>錯誤</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -809,12 +804,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -948,27 +943,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>有新版本</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>%1 客戶端有新版本了。</p><p><b>%2</b> 可供下載，目前安裝的版本是 %3 。<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>跳過這次更新</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>取得更新</translation>
</message>
@@ -1394,17 +1389,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1441,12 +1436,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
@@ -1455,7 +1450,7 @@ It is not advisable to use it.</source>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
@@ -1590,22 +1585,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation type="unfinished"/>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 5e29fa7..5ed820d 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -373,12 +373,12 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="89"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
- <translation type="unfinished"/>
+ <translation>CSync, günlük dosyası yükleyemedi veya oluşturamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="93"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>CSync günlük dosyasına yazamadı.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="151"/>
@@ -513,19 +513,14 @@
<translation>'%1' ve diğer %2 dosya %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
- <source>Error</source>
- <translation>Hata</translation>
- </message>
- <message>
- <location filename="../src/mirall/folder.cpp" line="711"/>
+ <location filename="../src/mirall/folder.cpp" line="706"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="709"/>
<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>
@@ -534,17 +529,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="718"/>
+ <location filename="../src/mirall/folder.cpp" line="713"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="720"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="716"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -812,12 +807,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="258"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="244"/>
<source>Enter Password</source>
<translation>Parolayı Girin</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="259"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="245"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation>
</message>
@@ -953,27 +948,27 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::NSISUpdater</name>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="293"/>
+ <location filename="../src/updater/ocupdater.cpp" line="252"/>
<source>New Version Available</source>
<translation>Yeni Sürüm Mevcut</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="299"/>
+ <location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.<p></source>
<translation><p>%1 İstemcisi yeni sürümü mevcut.</p><p><b>%2</b> artık indirilebilir. Kurulu sürüm %3.<p></translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="312"/>
+ <location filename="../src/updater/ocupdater.cpp" line="271"/>
<source>Skip this version</source>
<translation>Bu sürümü atla</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="313"/>
+ <location filename="../src/updater/ocupdater.cpp" line="272"/>
<source>Skip this time</source>
<translation>Bu kez atla</translation>
</message>
<message>
- <location filename="../src/updater/ocupdater.cpp" line="314"/>
+ <location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
<translation>Güncellemeyi al</translation>
</message>
@@ -1400,17 +1395,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFile</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="556"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="554"/>
<source>Sync was aborted by user.</source>
<translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="611"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="609"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="621"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="619"/>
<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>
@@ -1420,12 +1415,12 @@ Kullanmanız önerilmez.</translation>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="126"/>
<source>The file was removed from a read only share. The file has been restored.</source>
- <translation type="unfinished"/>
+ <translation>Dosya salt okunur bir paylaşımdan kaldırılmıştı. Dosya geri yüklendi.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="128"/>
<source>A file was removed from a read only share, but restoring failed: %1</source>
- <translation type="unfinished"/>
+ <translation>Dosya bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation>
</message>
</context>
<context>
@@ -1447,12 +1442,12 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="893"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="894"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="895"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="896"/>
<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>
@@ -1461,7 +1456,7 @@ Kullanmanız önerilmez.</translation>
<name>Mirall::PropagateUploadFile</name>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="365"/>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="419"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="420"/>
<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>
@@ -1597,22 +1592,22 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="52"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
<source>%1 - Authenticate</source>
<translation>%1 - Kimlik Doğrulaması</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="113"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="117"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
<source>Error loading IdP login page</source>
<translation>ldP oturum sayfası yüklenirken hata</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>Could not load Shibboleth login page to log you in.
Please ensure that your network connection is working.</source>
<translation>Oturumunuzun açılabilmesi için Shibboleth oturum sayfası yüklenemedi.
--
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