[Pkg-owncloud-commits] [owncloud-client] 49/70: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat May 17 20:01:30 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 7a28b44128c2d84026f62b53faf8318f8484fe96
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Thu May 15 01:25:29 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 40 ++++++++++++++++++------------------
translations/mirall_cs.ts | 40 ++++++++++++++++++------------------
translations/mirall_de.ts | 40 ++++++++++++++++++------------------
translations/mirall_el.ts | 48 ++++++++++++++++++++++----------------------
translations/mirall_en.ts | 40 ++++++++++++++++++------------------
translations/mirall_es.ts | 40 ++++++++++++++++++------------------
translations/mirall_es_AR.ts | 40 ++++++++++++++++++------------------
translations/mirall_et.ts | 40 ++++++++++++++++++------------------
translations/mirall_eu.ts | 40 ++++++++++++++++++------------------
translations/mirall_fa.ts | 40 ++++++++++++++++++------------------
translations/mirall_fi.ts | 40 ++++++++++++++++++------------------
translations/mirall_fr.ts | 40 ++++++++++++++++++------------------
translations/mirall_gl.ts | 40 ++++++++++++++++++------------------
translations/mirall_hu.ts | 40 ++++++++++++++++++------------------
translations/mirall_it.ts | 40 ++++++++++++++++++------------------
translations/mirall_ja.ts | 42 +++++++++++++++++++-------------------
translations/mirall_nl.ts | 40 ++++++++++++++++++------------------
translations/mirall_pl.ts | 40 ++++++++++++++++++------------------
translations/mirall_pt.ts | 40 ++++++++++++++++++------------------
translations/mirall_pt_BR.ts | 40 ++++++++++++++++++------------------
translations/mirall_ru.ts | 40 ++++++++++++++++++------------------
translations/mirall_sk.ts | 40 ++++++++++++++++++------------------
translations/mirall_sl.ts | 40 ++++++++++++++++++------------------
translations/mirall_sv.ts | 40 ++++++++++++++++++------------------
translations/mirall_th.ts | 40 ++++++++++++++++++------------------
translations/mirall_tr.ts | 40 ++++++++++++++++++------------------
translations/mirall_uk.ts | 40 ++++++++++++++++++------------------
translations/mirall_zh_CN.ts | 40 ++++++++++++++++++------------------
translations/mirall_zh_TW.ts | 40 ++++++++++++++++++------------------
29 files changed, 585 insertions(+), 585 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 073d219..896d89f 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -346,14 +346,14 @@
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -390,57 +390,57 @@ Esteu segur que voleu executar aquesta operació?</translation>
<translation>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Espera per començar la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>El servidor no està disponible actualment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
@@ -1506,12 +1506,12 @@ Proveu de sincronitzar-los de nou.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Error d'accés</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Cal identificar-se com a usuari %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Proveu de sincronitzar-los de nou.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticat</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index a067659..cb0c398 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -346,14 +346,14 @@
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -390,57 +390,57 @@ Opravdu chcete provést tuto akci?</translation>
<translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Vyčkává na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Server je nyní nedostupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
@@ -1507,12 +1507,12 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Chyba přihlášení</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Musíte se přihlásit jako uživatel %1</translation>
</message>
@@ -1520,12 +1520,12 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - ověření</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index c05c216..e9affae 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -347,14 +347,14 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -363,17 +363,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -391,57 +391,57 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Der Server ist momentan nicht erreichbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Setup-Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
@@ -1507,12 +1507,12 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Log-In Fehler</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Sie müssen sich als %1 einloggen</translation>
</message>
@@ -1520,12 +1520,12 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Authentifikation</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 0728ed8..f83ead4 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -346,14 +346,14 @@
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -390,57 +390,57 @@ Are you sure you want to perform this operation?</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμια εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη κατάσταση.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Ο Συγχρονισμός Παύθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμούς)</translation>
</message>
@@ -1000,7 +1000,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="111"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
- <translation type="unfinished"/>
+ <translation>Ο φάκελος %1 '%2' είναι συγχρονισμένος με τον τοπικό φάκελο '%3'</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="117"/>
@@ -1506,12 +1506,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Σφάλμα σύνδεσης</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Πρέπει να εισέλθετε σαν χρήστης %1</translation>
</message>
@@ -1519,12 +1519,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Πιστοποίηση</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1876,7 +1876,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/syncengine.cpp" line="182"/>
<source>An internal error number %1 happened.</source>
- <translation type="unfinished"/>
+ <translation>Συνέβη εσωτερικό σφάλμα με αριθμό %1.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="240"/>
@@ -1935,7 +1935,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="179"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>Αποσύνδεση από τον διακομιστή</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="211"/>
@@ -2359,7 +2359,7 @@ Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, ownCloud Inc.
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="44"/>
<source>Filesystem access error</source>
- <translation type="unfinished"/>
+ <translation>Σφάλμα πρόσβασης στο σύστημα αρχείων</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="46"/>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 5a7cae0..7a116b2 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -348,30 +348,30 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -389,57 +389,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -1500,12 +1500,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1513,12 +1513,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 54d40c3..39958e7 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -346,14 +346,14 @@
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -390,57 +390,57 @@ Está seguro de que desea realizar esta operación?</translation>
<translation>Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Esperando el inicio de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>El servidor no está disponible en el momento</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronización fue exitosa pero con advertencias para archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -1506,12 +1506,12 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Error al iniciar sesión</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Debe iniciar sesión como el usuario %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticar</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index d4856e9..3ca868c 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -346,14 +346,14 @@
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -390,57 +390,57 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Esperando el comienzo de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>El servidor actualmente no está disponible.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -1504,12 +1504,12 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1517,12 +1517,12 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticarse</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index b1eadf5..6a253c4 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -346,14 +346,14 @@
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -390,57 +390,57 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Ootab sünkroniseerimise alustamist.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Server pole hetkel saadaval.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
@@ -1506,12 +1506,12 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Sisselogimise viga</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Pead sisse logima kui kasutaja %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - autentimine</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index aaeec0d..f82b6c2 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -346,30 +346,30 @@
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -387,57 +387,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Zerbitzaria orain ez dago eskuragarri.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Erabiltzaileak Bertan Behera Utzi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
@@ -1501,12 +1501,12 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1514,12 +1514,12 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index d65ccea..97adcdd 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -346,30 +346,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -387,57 +387,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>صبر کنید تا همگام سازی آغاز شود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1498,12 +1498,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1511,12 +1511,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index ccebfc3..ba883a8 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -346,30 +346,30 @@
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -387,57 +387,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Odottaa synkronoinnin alkamista.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Palvelin ei ole käytettävissä.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
@@ -1500,12 +1500,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Kirjautumisvirhe</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Kirjaudu käyttäjänä %1</translation>
</message>
@@ -1513,12 +1513,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Tunnistaudu</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 4d2f4f6..42eac40 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -346,14 +346,14 @@
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -390,57 +390,57 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Le serveur est indisponible actuellement.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Dernière synchronisation effectuée avec succès</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
@@ -1506,12 +1506,12 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Erreur de connexion</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Vous devez vous connecter en tant qu'utilisateur %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Authentifier</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index c98026c..39d05a5 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -346,14 +346,14 @@
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -390,57 +390,57 @@ Confirma que quere realizar esta operación?</translation>
<translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Agardando polo comezo da sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>O servidor non está dispoñíbel actualmente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
@@ -1506,12 +1506,12 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Erro de acceso</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Ten que rexistrarse como usuario %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticado</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 2cd088a..a48cd3f 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -346,30 +346,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<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="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -387,57 +387,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>A kiszolgáló jelenleg nem érhető el.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1498,12 +1498,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1511,12 +1511,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 49085c1..7e57de8 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -346,14 +346,14 @@
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -390,57 +390,57 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<translation>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Attende l'inizio della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Il server è attualmente non disponibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stato completata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
@@ -1505,12 +1505,12 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Errore di accesso</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Devi accedere con l'utente %1</translation>
</message>
@@ -1518,12 +1518,12 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticazione</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 0676425..3b7f370 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -346,14 +346,14 @@
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -390,57 +390,57 @@ Are you sure you want to perform this operation?</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>サーバーは現在利用できません。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
@@ -1505,12 +1505,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>ログインエラー</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>ユーザ %1 としてログインする必要があります</translation>
</message>
@@ -1518,12 +1518,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - 認証</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -2290,7 +2290,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudtheme.cpp" line="95"/>
<source>If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info.</source>
<comment>Top text in setup wizard. Keep short!</comment>
- <translation>ownCloudサーバーをまだ持っていない場合は、<a href="https://owncloud.com">owncloud.com</a>で詳細な情報を参照してください。</translation>
+ <translation>ownCloudサーバーをまだ持っていない場合、詳細は <a href="https://owncloud.com">owncloud.com</a>を参照してください。</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 42cd472..24c666a 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -346,14 +346,14 @@
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -390,57 +390,57 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>De server is nu niet beschikbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was succesvol.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
@@ -1506,12 +1506,12 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Inlogfout</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>U moet inloggen als gebruiker %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - authenticeren</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index a5ba23d..0b9e170 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -346,14 +346,14 @@
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
Jeśli Ty lub Twój administrator zresetowali Twoje konto na serwerze, wybierz "Zachowaj pliki". Jeśli chcesz aby Twoje dane zostały usunięte, wybierz "Usuń wszystkie pliki".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -390,57 +390,57 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<translation>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Czekają na uruchomienie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Serwer jest obecnie niedostępny.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
@@ -1506,12 +1506,12 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Błąd logowania</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Musisz zalogować się jako użytkownik %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Uwierzytelnienia</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index f90d51f..afc5112 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -346,14 +346,14 @@
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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 ficheiros sincronizados na pasta local '%1'.
Se você ,ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -361,17 +361,17 @@ Are you sure you want to perform this operation?</source>
Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -389,57 +389,57 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<translation>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>A aguardar o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>A sincronização está a correr.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>O servidor não está disponível de momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi efectuada com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Cancelado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>A sincronização está em pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronização em pausa)</translation>
</message>
@@ -1503,12 +1503,12 @@ Por favor tente sincronizar novamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1516,12 +1516,12 @@ Por favor tente sincronizar novamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticação</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 681e043..a0661e9 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -346,14 +346,14 @@
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -390,57 +390,57 @@ Você tem certeza que quer executar esta operação?</translation>
<translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Aguardando o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Servidor indisponível no momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Erro de configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Usuário Abortou</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
@@ -1504,12 +1504,12 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Erro de Login</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Você deve entrar como usuário %1</translation>
</message>
@@ -1517,12 +1517,12 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autenticar</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 0cf07e6..f92aa75 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -346,14 +346,14 @@
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -390,57 +390,57 @@ Are you sure you want to perform this operation?</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Ожидает, чтобы начать синхронизацию.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Сервер недоступен.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
@@ -1506,12 +1506,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1519,12 +1519,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Авторизация</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 669edcb..d211317 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -346,14 +346,14 @@
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -390,57 +390,57 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Čakanie na štart synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Sever momentálne nie je prístupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia sa úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Zrušenie používateľom</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia zapauzovaná)</translation>
</message>
@@ -1505,12 +1505,12 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Chybné prihlásenie</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Musíte sa prihlásiť ako používateľ %1</translation>
</message>
@@ -1518,12 +1518,12 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - overenie</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 87c2671..353f240 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -346,14 +346,14 @@
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -390,57 +390,57 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<translation>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>V čakanju na začetek usklajevanja.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Strežnik trenutno ni na voljo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
@@ -1506,12 +1506,12 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Napaka prijave</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Prijaviti se je treba kot uporabnik %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Overitev</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index f325973..673297f 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -346,14 +346,14 @@
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -390,57 +390,57 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Servern är för tillfället inte tillgänglig.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
@@ -1506,12 +1506,12 @@ Försök att synka dessa igen.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Login fel</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>Du måste logga in som en användare %1</translation>
</message>
@@ -1519,12 +1519,12 @@ Försök att synka dessa igen.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Autentisera</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index ceeef12..a5f70a5 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -346,30 +346,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -387,57 +387,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1498,12 +1498,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1511,12 +1511,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 47533c2..6d850d8 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -346,14 +346,14 @@
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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>
@@ -362,17 +362,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -390,57 +390,57 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<translation>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Eşitleme başlatmak için bekleniyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>Sunucu şu an kullanılabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Son eşitleme başarılıydı, ancak bireysel dosyalarda uyarılar vardı</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Kurulum hatası.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
@@ -1505,12 +1505,12 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>Oturum Açma Hatası</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation>%1 kullanıcısı olarak oturum açmalısınız</translation>
</message>
@@ -1518,12 +1518,12 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation>%1 - Kimlik Doğrulaması</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 334a0de..7083838 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -346,30 +346,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -387,57 +387,57 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1498,12 +1498,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1511,12 +1511,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 52e2e25..059a604 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -346,30 +346,30 @@
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -387,57 +387,57 @@ Are you sure you want to perform this operation?</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation>服务器当前是不可用的。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1498,12 +1498,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation>登录错误</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1511,12 +1511,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 6a097b8..61d0bb5 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -346,30 +346,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="678"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="681"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="685"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="687"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="688"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -387,57 +387,57 @@ Are you sure you want to perform this operation?</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="753"/>
+ <location filename="../src/mirall/folderman.cpp" line="754"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="756"/>
+ <location filename="../src/mirall/folderman.cpp" line="757"/>
<source>Waits to start syncing.</source>
<translation>等待啟動同步</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="759"/>
+ <location filename="../src/mirall/folderman.cpp" line="760"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="762"/>
+ <location filename="../src/mirall/folderman.cpp" line="763"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="765"/>
+ <location filename="../src/mirall/folderman.cpp" line="766"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="768"/>
+ <location filename="../src/mirall/folderman.cpp" line="769"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="773"/>
+ <location filename="../src/mirall/folderman.cpp" line="774"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="776"/>
+ <location filename="../src/mirall/folderman.cpp" line="777"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="779"/>
+ <location filename="../src/mirall/folderman.cpp" line="780"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="782"/>
+ <location filename="../src/mirall/folderman.cpp" line="783"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="788"/>
+ <location filename="../src/mirall/folderman.cpp" line="789"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -1498,12 +1498,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="300"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="252"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1511,12 +1511,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethWebView</name>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="58"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="54"/>
<source>%1 - Authenticate</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="119"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="90"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list