[Pkg-owncloud-commits] [owncloud-client] 108/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:40 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 8aebbefb28d43754271e869f2a9064aa68f61b8b
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Fri Mar 7 01:26:50 2014 -0500
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 107 ++++++++++++++++++--------------
translations/mirall_cs.ts | 107 ++++++++++++++++++--------------
translations/mirall_de.ts | 107 ++++++++++++++++++--------------
translations/mirall_el.ts | 107 ++++++++++++++++++--------------
translations/mirall_en.ts | 104 +++++++++++++++++--------------
translations/mirall_es.ts | 107 ++++++++++++++++++--------------
translations/mirall_es_AR.ts | 107 ++++++++++++++++++--------------
translations/mirall_et.ts | 107 ++++++++++++++++++--------------
translations/mirall_eu.ts | 107 ++++++++++++++++++--------------
translations/mirall_fa.ts | 104 +++++++++++++++++--------------
translations/mirall_fi.ts | 106 ++++++++++++++++++--------------
translations/mirall_fr.ts | 107 ++++++++++++++++++--------------
translations/mirall_gl.ts | 107 ++++++++++++++++++--------------
translations/mirall_hu.ts | 106 ++++++++++++++++++--------------
translations/mirall_it.ts | 107 ++++++++++++++++++--------------
translations/mirall_ja.ts | 107 ++++++++++++++++++--------------
translations/mirall_nl.ts | 107 ++++++++++++++++++--------------
translations/mirall_pl.ts | 143 ++++++++++++++++++++++++-------------------
translations/mirall_pt.ts | 106 ++++++++++++++++++--------------
translations/mirall_pt_BR.ts | 107 ++++++++++++++++++--------------
translations/mirall_ru.ts | 107 ++++++++++++++++++--------------
translations/mirall_sk.ts | 124 ++++++++++++++++++++-----------------
translations/mirall_sl.ts | 107 ++++++++++++++++++--------------
translations/mirall_sv.ts | 104 +++++++++++++++++--------------
translations/mirall_th.ts | 104 +++++++++++++++++--------------
translations/mirall_uk.ts | 104 +++++++++++++++++--------------
translations/mirall_zh_CN.ts | 104 +++++++++++++++++--------------
translations/mirall_zh_TW.ts | 104 +++++++++++++++++--------------
translations/pofiles/tr.po | 107 ++++++++++++++++++--------------
29 files changed, 1762 insertions(+), 1370 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 1a3f654..aa7579b 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -144,6 +144,11 @@
<translation><p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>S'està sincronitzant.<br/>Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 de %2 (%3%) en ús.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connectat a <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>La connexió ha fallat</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>No hi ha cap compte ownCloud configurat</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurat per aquest client és massa antic</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Actualitzeu el servidor a l'última versió i reestabliu el client.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>No es pot connectar amb %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Les credencials proporcionades no són correctes</translation>
</message>
@@ -467,6 +482,11 @@
<translation>baixat</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>eliminat</translation>
@@ -507,14 +527,14 @@
<translation>'%1' i %2 altres fitxers s'han %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -801,12 +821,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Escriviu contrasenya</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<translation>El servidor Proxy requereix autenticació</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Ample de banda de baixada</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limita a</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Sense límit</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Ample de banda de pujada</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limita automàticament</translation>
</message>
@@ -1475,17 +1495,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1615,27 +1640,15 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticat</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Assegureu-vos que la connexió a la xarxa funciona.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index ee020d9..987c94d 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -144,6 +144,11 @@
<translation><p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 z %2 (%3%) v užívání.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Připojeno k <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Spojení selhalo</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Žádný účet ownCloud nenastaven</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Server nastavený pro tohoto klienta je příliš starý</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Prosím, aktualizujte na poslední verzi serveru a restartujte klienta.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Nelze se připojit k %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Poskytnuté přihlašovací údaje nejsou správné</translation>
</message>
@@ -467,6 +482,11 @@
<translation>staženo</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>odstraněno</translation>
@@ -507,14 +527,14 @@
<translation> '%1' a %2 dalších souborů bylo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -801,12 +821,12 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Zadejte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation>
</message>
@@ -1010,35 +1030,35 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<translation>Proxy server vyžaduje přihlášení</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Rychlost stahování</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Omezit na</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytů/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Bez limitu</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Rychlost odesílání</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Omezovat automaticky</translation>
</message>
@@ -1477,17 +1497,22 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Rozšíření X-OC-MTime není k dispozici, je vyžadováno ownCloud 5</translation>
</message>
@@ -1619,27 +1644,15 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - ověření</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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í.
-Ujistěte se, prosím, že síťové spojení funguje.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 65db007..e42f7f3 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -145,6 +145,11 @@
Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Keine Verbindung mit %1 zu <a href="%2">%3</a>.</translation>
@@ -170,11 +175,6 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 von %2 (%3%) benutzt.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbunden mit <a href="%1">%2</a>.</translation>
@@ -221,11 +221,26 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Verbindung fehlgeschlagen</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -410,27 +425,27 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Kein ownCloud-Konto konfiguriert</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Der konfigurierte Server ist für diesen Klient zu alt</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Aktualisieren Sie auf die letzte Server-Version und starten Sie den Klient neu.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Verbinden mit %1 nicht möglich</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Die zur Verfügung gestellten Anmeldeinformationen sind nicht korrekt</translation>
</message>
@@ -468,6 +483,11 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Heruntergeladen</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>Entfernt</translation>
@@ -508,14 +528,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="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -524,17 +544,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -802,12 +822,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="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Passwort eingeben</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation>
</message>
@@ -1011,35 +1031,35 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<translation>Proxyserver erfordert eine Authentifizierung</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Download-Bandbreite</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Begrenzen auf</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Keine Begrenzung</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Upload-Bandbreite</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Automatisch begrenzen</translation>
</message>
@@ -1478,17 +1498,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Keine X-OC-MTime Erweiterung vorhanden, owncloud 5 ist erforderlich</translation>
</message>
@@ -1619,27 +1644,15 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Authentifikation</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Bitte stellen Sie sicher, dass Ihre Netzwerkverbindung funktioniert.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 2b480e4..73abbc1 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -144,6 +144,11 @@
<translation><p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του πελάτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο [...]
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 από %2 (%3%) σε χρήση.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Σύνδεση απέτυχε</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Δεν έχει ρυθμιστεί λογαριασμός ownCloud</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Ο ρυθμισμένος διακομιστής για αυτόν το δέκτη είναι πολύ παλιός</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Παρακαλώ ενημερώστε στον τελευταίο διακομιστή και επανεκκινήστε το δέκτη.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Αδυναμία σύνδεσης με %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Τα παρεχόμενα διαπιστευτήρια δεν είναι σωστά</translation>
</message>
@@ -467,6 +482,11 @@
<translation>κατέβηκε</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>αφαιρέθηκε</translation>
@@ -507,14 +527,14 @@
<translation>Τα '%1' και άλλα %2 αρχεία %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -801,12 +821,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Ο ενδιάμεσος διακομιστής απαιτεί πιστοποίηση</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Ταχύτητα λήψεως</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Περιορισμός σε</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Χωρίς Όριο</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Ταχύτητα μεταφόρτωσης</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Αυτόματος περιορισμός</translation>
</message>
@@ -1477,17 +1497,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1618,27 +1643,15 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Πιστοποίηση</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="119"/>
- <source>Could not load Shibboleth login page to log you in.
-Please ensure that your network connection is working.</source>
- <translation>Δεν ήταν δυνατή η φόρτωση της σελίδας σύνδεσης Shibboleth.
-Παρακαλώ βεβαιωθείτε ότι η σύνδεσή σας είναι ενεργή.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 3d5e56f..e7a6e52 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -146,6 +146,11 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"></translation>
@@ -171,11 +176,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
@@ -222,10 +222,25 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -411,27 +426,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"></translation>
</message>
@@ -469,6 +484,11 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"></translation>
@@ -509,30 +529,30 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -800,12 +820,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"></translation>
</message>
@@ -1007,35 +1027,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation type="unfinished"></translation>
</message>
@@ -1472,17 +1492,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"></translation>
</message>
@@ -1612,24 +1637,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 359714d..750367d 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -144,6 +144,11 @@
<translation><p>Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>No hay conexión a %1 en <a href="%2">%3</a>.</translation>
@@ -169,11 +174,6 @@
<translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 de %2 (%3%) en uso.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>La conexión falló</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Ninguna cuenta de ownCloud se ha configurado</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>La configuración del servidor al cliente es obsoleta</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualice a la ultima verisón del servidor y reinicie el cliente</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Imposible conectar a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Las credenciales proporcionadas no son correctas</translation>
</message>
@@ -467,6 +482,11 @@
<translation>Descargado</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>eliminado</translation>
@@ -507,14 +527,14 @@
<translation>'%1' y %2 otros archivos son %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -801,12 +821,12 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Introduzca la Contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, introduzca su %1 contraseña para el usuario '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<translation>El servidor proxy requiere autenticación</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Ancho de banda de descarga</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limitar a</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Ilimitado</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Acho de banda de subida</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limitar automáticamente</translation>
</message>
@@ -1477,17 +1497,22 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>No hay una extensión X-OC-MTime, se requiere ownCloud 5</translation>
</message>
@@ -1618,27 +1643,15 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticar</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Por favor asegurese de que la conexión de red está trabajando.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index a185742..4c949da 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -144,6 +144,11 @@
<translation><p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p>< [...]
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 de %2(%3) en uso.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Fallo de Conexión</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>No hay una cuenta ownCloud configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>La configuración del servidor al cliente es obsoleta</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualice a la última versión del servidor y reinicie el cliente.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Imposible conectar a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Las credenciales otorgadas no son correctas</translation>
</message>
@@ -467,6 +482,11 @@
<translation>descargado</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>removido</translation>
@@ -507,14 +527,14 @@
<translation>'%1' y %2 otros archivos han sido %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -801,12 +821,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="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Ingresar contraseña</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<translation>El servidor proxy requiere autenticación</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Ancho de banda de descarga</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limitar a</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Ilimitado</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Acho de banda de subida</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limitar automáticamente</translation>
</message>
@@ -1475,17 +1495,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1616,27 +1641,15 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticarse</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Por favor asegúrese que su conexión de red esté en buen estado.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 05f67db..f1129a2 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -144,6 +144,11 @@
<translation><p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>Kasutusel %1 / %2 (%3%)</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ühendatud <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Ühendus ebaõnnestus</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Ühtegi ownCloud kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Seadistatud server on selle kliendi jaoks liiga vana</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Palun uuenda server viimasele versioonile ning taaskäivita klient.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>%1-ga ühendumine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Sisestatud kasutajatunnused pole õiged</translation>
</message>
@@ -467,6 +482,11 @@
<translation>allalaaditud</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>eemaldatud</translation>
@@ -507,14 +527,14 @@
<translation>'%1' ja %2 teist faili on olnud %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -801,12 +821,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Sisesta parool</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Palun sisesta %1 parool kasutajale '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Proksi server nõuab autentimist</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Allalaadimise ülekandekiirus</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Piira</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBaiti/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Piiramatu</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Üleslaadimise ülekandekiirus</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Piira automaatselt</translation>
</message>
@@ -1477,17 +1497,22 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1618,27 +1643,15 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - autentimine</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Palun veendu, et võrguühendus toimib.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index b500676..0dc9d87 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -144,6 +144,11 @@
<translation><p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%2tik %1 (%%3) erabilita.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a>ra konektatuta.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Konexioak huts egin du</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Ez dago ownCloud konturik konfiguratuta</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Bezero honentzako konfiguratutako zerbitzaria oso zaharra da</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Mesedez eguneratu zerbitzarira eta berrabiarazi bezeroa.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Ezin izan da %1ra konektatu</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Emandako kredentzialak ez dira zuzenak</translation>
</message>
@@ -467,6 +482,11 @@
<translation>deskargatuta</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>ezabatuta</translation>
@@ -507,30 +527,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -798,12 +818,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Sartu Pasahitza</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation>
</message>
@@ -1007,35 +1027,35 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d
<translation>Proxy zerbitzariak autentikazioa behar du</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Deskargatzeko Banda Zabalera</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Honetara mugatu</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KByte/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Mugarik ez</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Igotzeko Banda Zabalera</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Automatikoki mugatu</translation>
</message>
@@ -1472,17 +1492,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1613,27 +1638,15 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
- <source>Error loading IdP login page</source>
- <translation>Errorea idP saioa hasteko orria kargatzen</translation>
- </message>
- <message>
- <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>Ezin da Shibboleth saioa hasteko orria kargatu saioa hasteko.
-Mesedez ziurtatu zure sareko konexioa ongi dagoela.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index b229f6b..3fdabb9 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -144,6 +144,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
@@ -220,10 +220,25 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
<translation type="unfinished"/>
</message>
</context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -467,6 +482,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
@@ -507,30 +527,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -798,12 +818,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1005,35 +1025,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation type="unfinished"/>
</message>
@@ -1470,17 +1490,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1610,24 +1635,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"/>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 9f3d5fc..7aa9984 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -144,6 +144,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1/%2 (%3 %) käytössä.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Muodosta yhteys - <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Yhteys epäonnistui</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>ownCloud-tiliä ei ole määritelty</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Määritelty palvelin on ohjelmistoversioltaan liian vanha tälle asiakasohjelmistolle</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Päivitä uusimpaan palvelinversioon ja käynnistä asiakasohjelmisto uudelleen.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Annetut tilitiedot eivät ole oikein</translation>
</message>
@@ -467,6 +482,11 @@
<translation>ladattu</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>poistettu</translation>
@@ -507,30 +527,30 @@
<translation>'%1' ja %2 muuta tiedostoa on %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -798,12 +818,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Anna salasana</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Anna käyttäjän '%2' %1-salasana:</translation>
</message>
@@ -1005,35 +1025,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Välityspalvelin vaatii tunnistautumisen</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Latauskaista</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Rajoita</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>kilotavua/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Ei rajoitusta</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Lähetyskaista</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Rajoita automaattisesti</translation>
</message>
@@ -1471,17 +1491,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1611,26 +1636,15 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Tunnistaudu</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="119"/>
- <source>Could not load Shibboleth login page to log you in.
-Please ensure that your network connection is working.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 77addf8..bcff699 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -144,6 +144,11 @@
<translation><p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre [...]
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Aucune connexion à %1 à <a href="%2">%3</a>.</translation>
@@ -169,11 +174,6 @@
<translation>La synchronisation est en cours.<br/>Voulez-vous y mettre un terme?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 of %2 (%3%) occupés.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connecté à <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Échec de la connexion</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Aucun compte ownCloud configuré</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Le serveur configuré pour ce client est trop vieux</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Veuillez mettre à jour avec la dernière version du serveur et redémarrer le client.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Impossible de se connecter à %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Les informations d'identification fournies ne sont pas correctes</translation>
</message>
@@ -467,6 +482,11 @@
<translation>téléchargé</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>supprimé</translation>
@@ -507,14 +527,14 @@
<translation>'%1' et %2 autres fichiers ont été %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -801,12 +821,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Entrez le mot de passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<translation>Le serveur mandataire requiert une authentification</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Bande passante de téléchargement</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limiter à</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KOctets/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Aucune limite</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Bande passante de téléversement</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limiter automatiquement</translation>
</message>
@@ -1477,17 +1497,22 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Aucune extension X-OC-MTime, ownCloud 5 est exigé</translation>
</message>
@@ -1618,27 +1643,15 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Authentifier</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Veuillez vous assurer qu'une connexion réseau est disponible.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 9911e6b..395305f 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -144,6 +144,11 @@
<translation><p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Sen conexión con %1 en <a href="%2">%3</a>.</translation>
@@ -169,11 +174,6 @@
<translation>Estase realizando a sincronización.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>Usado %1 de %2 (%3%).</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Produciuse un fallo de conexión</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Non hai configurada ningunha conta ownCloud </translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>O servidor configurado para este cliente é moi antigo</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Actualice ao último servidor e reinicie o cliente.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Non é posíbel conectar con %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>As credenciais fornecidas non son correctas</translation>
</message>
@@ -467,6 +482,11 @@
<translation>descargado</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>Retirado</translation>
@@ -507,14 +527,14 @@
<translation>«%1» e outros %2 ficheiros foron %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -801,12 +821,12 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Escriba o contrasinal</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Escriba o contrasinal %1 para o usuario «%2»:</translation>
</message>
@@ -1010,35 +1030,35 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<translation>O servidor proxy precisa autenticación</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Largo de banda de descarga</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limitar a</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Sen límite</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Largo de banda de envíos</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limitar automáticamente</translation>
</message>
@@ -1477,17 +1497,22 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presentes)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Non existe a extensión X-OC-MTime, require ownCloud 5</translation>
</message>
@@ -1618,27 +1643,15 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticado</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Asegúrese de que a súa conexión de rede está a funcionar.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index b80dcd6..ffef6ea 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -144,6 +144,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>A kapcsolódás sikertelen</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -467,6 +482,11 @@
<translation>letöltva</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>eltávolítva</translation>
@@ -507,30 +527,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<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="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -798,12 +818,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Jelszómegadás</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1005,35 +1025,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>A proxy szerver azonosítást kér</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Letöltési sávszélesség</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Korlátozva</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBájt/mp</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Nincs korlát</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Feltöltési sávszélesség</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation type="unfinished"/>
</message>
@@ -1470,17 +1490,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1610,24 +1635,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"/>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 7480227..81334d4 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -144,6 +144,11 @@
<translation><p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nessuna connessione a %1 su <a href="%2">%3</a>.</translation>
@@ -169,11 +174,6 @@
<translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 di %2 (%3%) utilizzati.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connesso a <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Connessione non riuscita</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Nessun account ownCloud configurato.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Il server configurato per questo client è troppo datato</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Aggiorna all'ultima versione del server e riavvia il client.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Impossibile connettersi a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Le credenziali fornite non sono corrette</translation>
</message>
@@ -467,6 +482,11 @@
<translation>scaricato</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>rimosso</translation>
@@ -507,14 +527,14 @@
<translation>'%1' e %2 altri file sono stati %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -801,12 +821,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Digita la password</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Digita la password di %1 per l'utente '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<translation>Il server proxy richiede l'autenticazione</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Ampiezza di banda in entrata</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limita a</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KByte/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Nessun limite</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Ampiezza di banda in uscita</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limita automaticamente</translation>
</message>
@@ -1476,17 +1496,22 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Nessun e-tag era presente)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Non è presente l'estensione X-OC-MTime, è richiesto ownCloud 5</translation>
</message>
@@ -1617,27 +1642,15 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticazione</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Assicurati che la tua connessione sia funzionante.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index ec72405..6c2cdc4 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -144,6 +144,11 @@
<translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 / %2 (%3%) を使用中です。</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> へ接続しました。</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>接続に失敗</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>ownCloud アカウントが設定されていません</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>このクライアントのサーバー設定は古すぎます。</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>サーバーを最新にアップデートして、クライアントを再起動してください。</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>%1 に接続できません</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>与えられた認証情報が正しくありません。</translation>
</message>
@@ -467,6 +482,11 @@
<translation>ダウンロード完了</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>削除</translation>
@@ -507,14 +527,14 @@
<translation>'%1' と %2 個のファイルは %3 です。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -802,12 +822,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>パスワードを入力してください</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>ユーザー '%2' の %1 パスワードを入力してください:</translation>
</message>
@@ -1011,35 +1031,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>プロキシサーバーは認証が必要です</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>ダウンロード帯域制限</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>制限</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>無制限</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>アップロード帯域制限</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>自動的に制限</translation>
</message>
@@ -1476,17 +1496,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1617,27 +1642,15 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - 認証</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="119"/>
- <source>Could not load Shibboleth login page to log you in.
-Please ensure that your network connection is working.</source>
- <translation>Shibboleth ログインページをロードできません。
-ネットワーク接続を確認してください。</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 7f04c8d..58f4502 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -144,6 +144,11 @@
<translation><p>Wilt u de map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> [...]
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Geen verbinding naar %1 op <a href="%2">%3</a>.</translation>
@@ -169,11 +174,6 @@
<translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 van %2 (%3%) in gebruik.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbonden met <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Verbinding mislukt</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Geen ownCloud-account geconfigureerd</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>De voor dit programma ingestelde server is te oud</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Werk update de server naar de nieuwste versie en herstart het programma.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Niet in staat om verbinding te maken met %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>De verstrekte inloggegevens zijn niet juist</translation>
</message>
@@ -467,6 +482,11 @@
<translation>gedownload</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>verwijderd</translation>
@@ -507,14 +527,14 @@
<translation>'%1' en %2 andere bestanden waren %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -801,12 +821,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Vul het wachtwoord in</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<translation>Proxyserver heeft verificatie nodig</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Bandbreedte downloaden</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Beperkt tot</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Geen beperking</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Bandbreedte uploaden</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Beperkt automatisch</translation>
</message>
@@ -1477,17 +1497,22 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Er is geen X-OC-MTime extensie aanwezig, ownCloud 5 is vereist</translation>
</message>
@@ -1618,27 +1643,15 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - authenticeren</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Controleer de werking van uw netwerkverbinding.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index d7f56cf..aa05f24 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -144,9 +144,14 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
- <translation type="unfinished"/>
+ <translation>Brak połączenia do %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="775"/>
@@ -169,11 +174,6 @@
<translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 z %2 (%3%) w użyciu.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Podłączony do <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Połączenie nie powiodło się</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -378,7 +393,7 @@
<message>
<location filename="../src/mirall/csyncthread.cpp" line="99"/>
<source>CSync failed to write the journal file.</source>
- <translation type="unfinished"/>
+ <translation>CSync nie udało się zapisać pliku dziennika.</translation>
</message>
<message>
<location filename="../src/mirall/csyncthread.cpp" line="157"/>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Nie skonfigurowano konta ownCloud</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Konfigurowany serwer dla tego klienta jest za stary</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Proszę zaaktualizować serwer do najnowszej wersji i zrestartować klienta.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Nie mogę połączyć się do %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Podane dane logowania są nieprawidłowe</translation>
</message>
@@ -467,6 +482,11 @@
<translation>Pobrane</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>Usunęte</translation>
@@ -507,30 +527,33 @@
<translation>'%1' i %2 inne pliki zostały %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
+Jeśli Ty lub Twój administrator zresetowali Twoje konto na serwerze, wybierz "Zachowaj pliki". Jeśli chcesz aby Twoje dane zostały usunięte, wybierz "Usuń wszystkie pliki".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
+Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub też wszystkie pliki zostały ręcznie usunięte.
+Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -798,12 +821,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Wprowadź hasło</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Proszę podać %1 hasło dla użytkownika '%2':</translation>
</message>
@@ -1007,35 +1030,35 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
<translation>Serwer proxy wymaga uwierzytelnienia</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Przepustowość pobierania</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limit do</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBajtów/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Brak limitu</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Przepustowość wysyłania</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limit automatyczniy</translation>
</message>
@@ -1149,7 +1172,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="124"/>
<source><p><small><strong>Warning:</strong> The local directory is not empty. Pick a resolution!</small></p></source>
- <translation type="unfinished"/>
+ <translation><p><small><strong>Uwaga:</strong> Lokalny katalog nie jest pusty. Wybierz rozważnie!</small></p></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="235"/>
@@ -1393,12 +1416,12 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation type="unfinished"/>
+ <translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation type="unfinished"/>
+ <translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
</context>
<context>
@@ -1414,7 +1437,7 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="110"/>
<source>could not create directory %1</source>
- <translation type="unfinished"/>
+ <translation>nie można utworzyć katalogu %1</translation>
</message>
</context>
<context>
@@ -1443,7 +1466,7 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="217"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
- <translation type="unfinished"/>
+ <translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="232"/>
@@ -1457,7 +1480,7 @@ Niezalecane jest jego użycie.</translation>
<location filename="../src/mirall/propagator_legacy.cpp" line="148"/>
<location filename="../src/mirall/propagator_legacy.cpp" line="207"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
+ <translation>Lokalny plik zmienił się podczas synchronizacji, synchronizuję ponownie ponieważ dotarł w całości.</translation>
</message>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="151"/>
@@ -1473,19 +1496,24 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
- <source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
+ <source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
+ <translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
- <translation type="unfinished"/>
+ <translation>Brak rozszerzenia X-OC-MTime, wymagany ownCloud 5</translation>
</message>
</context>
<context>
@@ -1614,26 +1642,15 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Uwierzytelnienia</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="118"/>
- <source>Error loading IdP login page</source>
- <translation>Błąd wczytywania strony logowania IdP</translation>
- </message>
- <message>
- <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"/>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
@@ -1715,7 +1732,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="124"/>
<source><p><b>Note:</b> This certificate was manually approved</p></source>
- <translation type="unfinished"/>
+ <translation><p><b>Uwaga:</b> Ten certyfikat został ręcznie zaakceptowany</p></translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="144"/>
@@ -1839,7 +1856,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/mirall/theme.cpp" line="205"/>
<source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br>%5 and the %5 logo are registered trademarks of %4 in the<br>United States, other countries, or both.</p></source>
- <translation type="unfinished"/>
+ <translation><p>Wersja %1 Aby uzyskać więcej informacji kliknij <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.<p><p>Rozprowadzany przez %4 i licencjonowany według GNU General Public License (GPL) Wersja 2.0.<br>%5 oraz logo %5 są zarejestrowanymi znakami towarowymi %4 w<br>Stanach Zjednoczonych, innych krajach lub obydwu.</p></translation>
</message>
</context>
<context>
@@ -1997,7 +2014,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="158"/>
<source><html><head/><body><p>If this box is checked, existing content in the local directory will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers directory.</p></body></html></source>
- <translation type="unfinished"/>
+ <translation><html><head/><body><p>Jeśli zaznaczysz, istniejąca zawartość w lokalnym katalogu zostanie wymazana w celu rozpoczęcia czystej synchronizacji z serwerem.</p><p>Nie zaznaczaj, jeśli chcesz aby lokalna zawartość została wysłana do katalogu na serwerze.</p></body></html></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="161"/>
@@ -2007,7 +2024,7 @@ Please ensure that your network connection is working.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="193"/>
<source><small>Erases the contents of the local folder before syncing using the new settings.</small></source>
- <translation type="unfinished"/>
+ <translation><small>Usuwa zawartość lokalnego folderu przed wykonaniem synchronizacji, z użyciem nowych ustawień.</small></translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="224"/>
@@ -2222,7 +2239,7 @@ Kliknij</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="56"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Based on Mirall by Duncan Mac-Vicar P.</small></p>%7</source>
- <translation type="unfinished"/>
+ <translation><p>Wersja %2. Aby uzyskać więcej informacji odwiedź <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.<br>Oparty na Mirall by Duncan Mac-Vicar P.</small></p>%7</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 075f7a6..d467d06 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -144,6 +144,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>A ligação falhou</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -410,27 +425,27 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Não foi possível ligar a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -468,6 +483,11 @@ 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="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>removido</translation>
@@ -508,30 +528,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="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -799,12 +819,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Introduza a Palavra-passe</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1006,35 +1026,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limitar para</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Sem limite</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limitar automaticamente</translation>
</message>
@@ -1471,17 +1491,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1611,24 +1636,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"/>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index b12b8a5..37ba0d8 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -144,6 +144,11 @@
<translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar o tráfego de dados significativo e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nenhuma conexão para %1 em <a href="%2">%3</a>.</translation>
@@ -169,11 +174,6 @@
<translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 de %2 (%3%) em uso.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado à <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Conexão falhou</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Nenhuma conta ownCloud configurada</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>O servidor configurado para este cliente é muito antigo</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor, atualize para o último servidor e reinicie o cliente.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Impossível se conectar a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>As credenciais fornecidas não estão corretas</translation>
</message>
@@ -467,6 +482,11 @@
<translation>baixado</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>removido</translation>
@@ -507,14 +527,14 @@
<translation>'%1' e %2 outros arquivos foram %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -802,12 +822,12 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Entrar Senha</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Por favor entrar %1 senha para o usuário '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<translation>Servidor proxy requer autenticação</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Baixar banda</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limitar a</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Sem Limite</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Enviar banda</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limite automático</translation>
</message>
@@ -1475,17 +1495,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último pedaço. (Nenhuma e-etiqueta estava presente)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Sem extensão X-OC-mtime, ownCloud 5 é necessário</translation>
</message>
@@ -1616,27 +1641,15 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticar</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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
-Certifique-se que sua conexão de rede está funcionando.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 726b14a..7858ec4 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -144,6 +144,11 @@
<translation><p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 из %2 (%3%) использовано.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Соединились с <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Сбой подключения</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Учётная запись OwnCloud не настроена</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Настроенный сервер слишком стар для этого клиента</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Пожалуйста, обновите сервер до последней версии и перезапустите клиент.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Невозможно подключиться к %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Введённые учётные данные не верны</translation>
</message>
@@ -467,6 +482,11 @@
<translation>скачано</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>удалено</translation>
@@ -507,14 +527,14 @@
<translation>'%1' и ещё %2 других файлов было %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -801,12 +821,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Введите пароль</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Пожалуйста введите пароль от %1 для пользователя '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Прокси-сервер требует учётные данные</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Пропускная способность загрузки</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Ограничить до</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>Кбайт/сек</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Без ограничений</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Пропускная способность закачки</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Ограничивать автоматически</translation>
</message>
@@ -1477,17 +1497,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1618,27 +1643,15 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Авторизация</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="119"/>
- <source>Could not load Shibboleth login page to log you in.
-Please ensure that your network connection is working.</source>
- <translation>Не удалось загрузить страницу входа Shibboleth.
-Пожалуйста, проверьте своё сетевое соединение.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index b3cd6b7..5bc18af 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -144,6 +144,11 @@
<translation><p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 of %2 (%3%) v používaní.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Pripojené k <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Spojenie zlyhalo</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Žiadny účet v ownCloude nie je nastavený</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Nakonfigurovaný server pre tohto klienta je príliš starý</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Prosím aktualizujte na najnovšiu verziu servera a reštartujte klienta.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Nedá sa pripojiť k %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Poskytnuté poverenia nie sú správne</translation>
</message>
@@ -467,6 +482,11 @@
<translation>stiahnuté</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>zmazané</translation>
@@ -507,14 +527,14 @@
<translation>'%1' a %2 ďalších súborov bolo %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -790,23 +810,23 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<message>
<location filename="../src/mirall/generalsettings.ui" line="66"/>
<source>Updates</source>
- <translation type="unfinished"/>
+ <translation>Aktualizácie</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="91"/>
<source>&Restart && Update</source>
- <translation type="unfinished"/>
+ <translation>&Restart && aktualizácia</translation>
</message>
</context>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Vložte heslo</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation>
</message>
@@ -860,12 +880,12 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="128"/>
<source>Edit Ignore Pattern</source>
- <translation type="unfinished"/>
+ <translation>Úprava ignorovacích vzorov</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="129"/>
<source>Edit ignore pattern:</source>
- <translation type="unfinished"/>
+ <translation>Uprav ignorovací vzor:</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="140"/>
@@ -1010,35 +1030,35 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<translation>Proxy server vyžaduje autentifikáciu</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Dátová šírka pre download</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Limitovať do</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytov/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Žiadny limit</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Dátová šírka pre upload</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Limitovať automaticky</translation>
</message>
@@ -1199,7 +1219,8 @@ for additional privileges during the process.</source>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="105"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
- <translation type="unfinished"/>
+ <translation>Táto adresa nie je bezpečná, pretože nie je šifrovaná.
+Nie je vhodné ju používať.</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="109"/>
@@ -1209,7 +1230,7 @@ It is not advisable to use it.</source>
<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>Nemožno bezpečne pripojiť. Chcete sa pripojiť nešifrovane (neodporúča sa)?</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="224"/>
@@ -1475,17 +1496,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1615,27 +1641,15 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - overenie</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
@@ -1707,12 +1721,12 @@ Skontrolujte prosím, či máte pracuje pripojenie k sieti.</translation>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="119"/>
<source>MD 5:</source>
- <translation type="unfinished"/>
+ <translation>MD 5:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="120"/>
<source>SHA-1:</source>
- <translation type="unfinished"/>
+ <translation>SHA-1:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="124"/>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 60cb883..335fb2b 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -144,6 +144,11 @@
<translation><p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 od %2 (%3%) v uporabi.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Povezava je spodletela</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Ni nastavljenega računa v oblaku ownCloud</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Nastavljen strežnik tega odjemalca je prestar.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Posodobite strežnik in ponovno zaženite odjemalca.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Povezava z %1 ni mogoča.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Podana poverila niso pravilna.</translation>
</message>
@@ -467,6 +482,11 @@
<translation>prejeta.</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>odstranjena.</translation>
@@ -507,14 +527,14 @@
<translation>'%1' in %2 drugih datotek je %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -801,12 +821,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Vnos gesla</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation>
</message>
@@ -1010,35 +1030,35 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
<translation>Posredniški strežnik zahteva overitev</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Pasovna širina prejemanja</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Omeji na</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBajtov/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Ni omejitve</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Pasovna širina pošiljanja</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Samodejno omeji</translation>
</message>
@@ -1477,17 +1497,22 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Ni prejetega odziva s strežnnika s potrdilom o prejemu zadnjega dela datoteke (ni prejete oznake).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Ni razširitve X-OC-MTime, saj zahteva namestitev ownCloud 5.</translation>
</message>
@@ -1618,27 +1643,15 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Overitev</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Prepričajte se, da je omrežna povezava omogočena in delujoča.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 8b72ba2..d3b2ab4 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -144,6 +144,11 @@
<translation><p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ansluten till <a href="%1">%2</a>.</translation>
@@ -220,10 +220,25 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
<translation type="unfinished"/>
</message>
</context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Den konfigurerade servern är för den här klienten är för gammal</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Uppgradera servern och starta sedan om klienten.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>Kan ej koppla upp till %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>De angivna uppgifterna stämmer ej</translation>
</message>
@@ -467,6 +482,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
@@ -507,14 +527,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -801,12 +821,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="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1010,35 +1030,35 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<translation>Proxyservern kräver autentisering</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>Bandbredd för nedladdning</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Begränsa till</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBytes/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Ingen gräns</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Bandbredd för uppladdning</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Begränsa automatiskt</translation>
</message>
@@ -1475,17 +1495,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1615,24 +1640,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"/>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index d0a9d1f..7639c45 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -144,6 +144,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
@@ -220,10 +220,25 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
<translation type="unfinished"/>
</message>
</context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -467,6 +482,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
@@ -507,30 +527,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -798,12 +818,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1005,35 +1025,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation type="unfinished"/>
</message>
@@ -1470,17 +1490,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1610,24 +1635,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"/>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index c0438d7..8de60db 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -144,6 +144,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
@@ -220,10 +220,25 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
<translation type="unfinished"/>
</message>
</context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -467,6 +482,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
@@ -507,30 +527,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -798,12 +818,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1005,35 +1025,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation type="unfinished"/>
</message>
@@ -1470,17 +1490,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1610,24 +1635,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"/>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index ce3eaf3..5ace1d1 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -144,6 +144,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>正在执行同步。<br />您确定要关闭它吗？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
@@ -220,10 +220,25 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
<translation type="unfinished"/>
</message>
</context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -467,6 +482,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
@@ -507,30 +527,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -798,12 +818,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1005,35 +1025,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation type="unfinished"/>
</message>
@@ -1470,17 +1490,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1610,24 +1635,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"/>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 236955c..e16d545 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -144,6 +144,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
@@ -169,11 +174,6 @@
<translation>正在同步中<br/>你真的想要中斷？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
@@ -220,10 +220,25 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
<translation type="unfinished"/>
</message>
</context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -467,6 +482,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation type="unfinished"/>
@@ -507,30 +527,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -798,12 +818,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::HttpCredentials</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1005,35 +1025,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation type="unfinished"/>
</message>
@@ -1470,17 +1490,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
@@ -1610,24 +1635,13 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <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="118"/>
- <source>Error loading IdP login page</source>
- <translation type="unfinished"/>
- </message>
- <message>
<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>
+ <source>%1 - %2</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index e977a3b..bd1e049 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -144,6 +144,11 @@
<translation><p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacaktır, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p></translation>
</message>
<message>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
+ <source>%1 (%3%) of %2 server space in use.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/accountsettings.cpp" line="768"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>%1 bağlantısı <a href="%2">%3</a> üzerinde yok.</translation>
@@ -169,11 +174,6 @@
<translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="729"/>
- <source>%1 of %2 (%3%) in use.</source>
- <translation>%1 / %2 (%%3) kullanımda.</translation>
- </message>
- <message>
<location filename="../src/mirall/accountsettings.cpp" line="761"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> ile bağlı.</translation>
@@ -220,11 +220,26 @@
</message>
</context>
<context>
- <name>Mirall::Application</name>
+ <name>Mirall::AuthenticationDialog</name>
<message>
- <location filename="../src/mirall/application.cpp" line="314"/>
- <source>Connection failed</source>
- <translation>Bağlantı başarısız</translation>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
+ <source>Authentication Required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
+ <source>Enter username and password for '%1' at %2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="35"/>
+ <source>&User:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="36"/>
+ <source>&Password:</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -409,27 +424,27 @@
<context>
<name>Mirall::ConnectionValidator</name>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="90"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
<source>No ownCloud account configured</source>
<translation>Hiçbir ownCloud hesabı yapılanırılmamış</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="105"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
<translation>Yapılandırılmış sunucu, bu istemci için çok eski</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Lütfen en son sunucuya güncelleyin veya istemciyi yeniden başlatın</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="120"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
<source>Unable to connect to %1</source>
<translation>%1 bağlantısı yapılamadı</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
<source>The provided credentials are not correct</source>
<translation>Sağlanan kimlik bilgileri doğru değil</translation>
</message>
@@ -467,6 +482,11 @@
<translation>indirildi</translation>
</message>
<message>
+ <location filename="../src/mirall/folder.cpp" line="313"/>
+ <source>%1: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/mirall/folder.cpp" line="370"/>
<source>removed</source>
<translation>kaldırıldı</translation>
@@ -507,14 +527,14 @@
<translation>'%1' ve diğer %2 dosya %3.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="691"/>
+ <location filename="../src/mirall/folder.cpp" line="690"/>
<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="694"/>
+ <location filename="../src/mirall/folder.cpp" line="693"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -523,17 +543,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="698"/>
+ <location filename="../src/mirall/folder.cpp" line="697"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="700"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -801,12 +821,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="265"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="274"/>
<source>Enter Password</source>
<translation>Parolayı Girin</translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="266"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="275"/>
<source>Please enter %1 password for user '%2':</source>
<translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation>
</message>
@@ -1010,35 +1030,35 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation>Vekil sunucusu kimlik doğrulama gerektiriyor</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="182"/>
+ <location filename="../src/mirall/networksettings.ui" line="190"/>
<source>Download Bandwidth</source>
<translation>İndirme Bant Genişliği</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="188"/>
- <location filename="../src/mirall/networksettings.ui" line="287"/>
+ <location filename="../src/mirall/networksettings.ui" line="196"/>
+ <location filename="../src/mirall/networksettings.ui" line="278"/>
<source>Limit to</source>
<translation>Şuna sınırla</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="210"/>
- <location filename="../src/mirall/networksettings.ui" line="312"/>
+ <location filename="../src/mirall/networksettings.ui" line="218"/>
+ <location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
<translation>KBayt/s</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="232"/>
- <location filename="../src/mirall/networksettings.ui" line="270"/>
+ <location filename="../src/mirall/networksettings.ui" line="227"/>
+ <location filename="../src/mirall/networksettings.ui" line="295"/>
<source>No limit</source>
<translation>Sınır yok</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="264"/>
+ <location filename="../src/mirall/networksettings.ui" line="272"/>
<source>Upload Bandwidth</source>
<translation>Gönderme Bant Genişliği</translation>
</message>
<message>
- <location filename="../src/mirall/networksettings.ui" line="277"/>
+ <location filename="../src/mirall/networksettings.ui" line="285"/>
<source>Limit automatically</source>
<translation>Otomatik sınırla</translation>
</message>
@@ -1476,17 +1496,22 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="189"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="186"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="204"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="203"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="213"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="249"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="245"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>X-OC-MTime uzantısı yok, ownCloud 5 gerekli</translation>
</message>
@@ -1617,27 +1642,15 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="53"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
<source>%1 - Authenticate</source>
<translation>%1 - Kimlik Doğrulaması</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="114"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
- <message>
- <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="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.
-Lütfen ağ bağlantınızın çalıştığından emin olun.</translation>
- </message>
</context>
<context>
<name>Mirall::SslButton</name>
--
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