From 48abe62151ee10496c84b5cbababff519d9d16bc Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 2 Oct 2013 09:08:33 -0400
Subject: [PATCH] [tx-robot] updated from transifex

---
 translations/mirall_ca.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_cs.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_de.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_el.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_en.ts    | 239 ++++++++++++++++++-----------------
 translations/mirall_es.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_es_AR.ts | 233 +++++++++++++++++-----------------
 translations/mirall_et.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_eu.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_fa.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_fi.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_fr.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_gl.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_hu.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_it.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_ja.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_nl.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_pl.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_pt.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_pt_BR.ts | 233 +++++++++++++++++-----------------
 translations/mirall_ru.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_sk.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_sl.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_sv.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_th.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_uk.ts    | 233 +++++++++++++++++-----------------
 translations/mirall_zh_CN.ts | 233 +++++++++++++++++-----------------
 translations/mirall_zh_TW.ts | 233 +++++++++++++++++-----------------
 28 files changed, 3335 insertions(+), 3195 deletions(-)

diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 0021ee052..109bc5d69 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Sincronització iniciada</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Ajuda</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Obre la carpeta %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Actualitzat</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Fitxers gestionats:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>No hi ha fitxers de sincronització configurats</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 892374053..bc8a9b01a 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -229,119 +229,6 @@
         <translation>Momentálně nejsou k dispozici žádné informace o využití úložiště</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>Synchronizace %1 zahájena</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Synchronizace zahájena pro %n nastavený adresář.</numerusform><numerusform>Synchronizace zahájena pro %n nastavené adresáře.</numerusform><numerusform>Synchronizace zahájena pro %n nastavených adresářů.</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Otevřít %1 v prohlížeči</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Počítám kvóty...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Neznámý stav</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Nastavení...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Podrobnosti...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Nápověda</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Ukončit %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Otevřít složku %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% z %2 v používání</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Aktuální</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Nic.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Poslední změny</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Spravované složky:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Otevřít složku &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Kvóta nedostupná</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Žádné položky nebyly nedávno synchronizovány</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Synchronizuji %1 z %2 (%3 z %4)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Složka %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Nejsou nastaveny žádné synchronizované složky.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Prosím, aktualizujte na poslední verzi serveru a restartujte klienta.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>Poskytnuté přihlašovací údaje nejsou správné</translation>
     </message>
@@ -1642,6 +1534,119 @@ dostupný pod původním názvem</translation>
         <translation>Získat aktualizaci</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index ac0a97ac3..e8ddf4a7c 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -230,119 +230,6 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
         <translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Sync gestartet</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Synchronisation wurde für %n konfigurierten Sync-Ordner gestartet.</numerusform><numerusform>Synchronisation wurde für %n konfigurierte Sync-Ordner gestartet.</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>%1 im Browser öffnen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Berechne Quote...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Unbekannter Status</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Details...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Hilfe</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>%1 beenden</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Ordner %1 öffnen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% von %2 benutzt</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Aktuell</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Keine.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Letzte Änderungen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Verwaltete Ordner:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Ordner &apos;%1&apos; öffnen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Quote unbekannt</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Keine kürzlich synchronisierten Elemente</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Synchronisiere %1 von %2 (%3 von %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Ordner %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Keine Sync-Ordner konfiguriert.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -510,7 +397,12 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
         <translation>Aktualisieren Sie auf die letzte Server-Version und starten Sie den Klient neu.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>Die zur Verfügung gestellten Anmeldeinformationen sind nicht korrekt</translation>
     </message>
@@ -1640,6 +1532,119 @@ name</source>
         <translation>Update durchführen</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 9466a3edc..221bdf6eb 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Ο συγχρονισμος ξεκινησε</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Άνοιγμα %1 στον περιηγητή</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Άγνωστη κατάσταση</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Ρυθμίσεις...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Λεπτομέρειες...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Βοήθεια</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Άνοιγμα %1 φακέλου</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Ενημερωμένο</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Πρόσφατες Αλλαγές</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Διαχείριση αρχείων:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Άνοιγμα καταλόγου &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Συγχρονισμός %1 από %2 (%3 από %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Φάκελος %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>Λάβετε την ενημέρωση </translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index e55638b2c..a9b88ef7b 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -231,122 +231,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -514,7 +398,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1641,6 +1530,122 @@ name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 845cadf74..9b1aafbdc 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -229,119 +229,6 @@
         <translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>Sincronización %1 iniciada</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Iniciada la sincronización de %n carpeta de sincronización configurada.</numerusform><numerusform>Iniciada la sincronización de %n carpetas de sincronización configuradas.</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Abrir %1 en el navegador</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Calculando cuota...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Estado desconocido</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Configuraciones...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Detalles...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Ayuda</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Cancelar %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Abrir carpeta %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% de %2 en uso</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Actualizado</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Ninguno.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Cambios recientes</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Carpetas administradas:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Abrir carpeta &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Cuota no disponible</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>No se han sincronizado elementos recientemente</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Archivo %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>No hay carpetas de sincronización configuradas.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Por favor actualice a la ultima verisón del servidor y reinicie el cliente</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>Las credenciales proporcionadas no son correctas</translation>
     </message>
@@ -1642,6 +1534,119 @@ original</translation>
         <translation>Actualizar</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 71eeaa67c..7a66d103b 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>Sincronización de %1 iniciada</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Comenzando con la sincronización para %n directorio(s) configurado para sincronizar.</numerusform><numerusform>Comenzando con la sincronización para %n directorio(s) configurados para sincronizar.</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Abrir %1 en el navegador...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Calculando cuota...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Estado desconocido</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Configuraciones...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Detalles...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Ayuda</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Cancelar %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Abrir directorio %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% de %2 en uso</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>actualizado</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Ninguno.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Cambios recientes</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Directorios administrados:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Abrir carpeta &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Cuota no disponible</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>No se sincronizaron elementos recientemente</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Directorio %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Los directorios de sincronización no están configurados.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1628,6 +1520,119 @@ name</source>
         <translation>Obtener actualización</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index d623c1842..e556fff03 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -229,119 +229,6 @@
         <translation>Hetkel pole mahu kasutuse info saadaval.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 sünkroniseerimine käivitati</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Sünkroniseering alustatud %n seadistatud kataloogile.</numerusform><numerusform>Sünkroniseering alustatud %n seadistatud kataloogile.</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Ava %1 brauseris</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Arvutan mahupiiri...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Tundmatu staatus</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Seaded...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Üksikasjad...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Abiinfo</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Lõpeta %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Ava kaust %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>Kasutusel %1% / %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Ajakohane</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Pole.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Hiljutised muudatused</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Hallatavad kaustad:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Ava kataloog &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Mahupiir n/a</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Sünkroniseerin %1 / %2 (%3 / %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Kataloog %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Palun uuenda server viimasele versioonile ning taaskäivita klient.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>Sisestatud kasutajatunnused pole õiged</translation>
     </message>
@@ -1641,6 +1533,119 @@ konflikt-failiks ning serveris asuv fail on saadaval algse nimega.</translation>
         <translation>Hangi uuendus</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 88e4f2493..bbada5909 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Sinkronizazioa hasi da</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Laguntza</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Ireki %1 karpeta</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Eguneratua</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Kudeatutako karpetak:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Ez dago sinkronizazio karpetarik definituta.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>Eskuratu eguneraketa</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index f63d29972..2b500568f 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 همگام سازی شروع شد.</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>راه‌نما</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>تا تاریخ</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>پوشه های مدیریت شده:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>پوشه  %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>هیچ پوشه ای همگام سازی شده‌ای تنظیم نشده است</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>به دست آوردن به روز رسانی</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index ebfcdaf83..a93e44416 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation type="unfinished"/>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Avaa %1 selaimeen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Tuntematon tila</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Asetukset...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Tiedot...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Ohje</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Lopeta %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Avaa %1-kansio</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1%/%2 käytössä</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Ajan tasalla</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Viimeisimmät muutokset</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Hallitut kansiot:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Avaa kansio &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Kohteita ei ole synkronoitu äskettäin</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Synkronoidaan %1/%2 (%3/%4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Kansio %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Synkronointikansioita ei ole määritetty.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Päivitä uusimpaan palvelinversioon ja käynnistä asiakasohjelmisto uudelleen.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>Päivitä</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 093116302..06b1fdcba 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -229,119 +229,6 @@
         <translation>Actuellement aucune information d&apos;utilisation de stockage n&apos;est disponible.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Synchronisation démarrée </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Synchronisation démarrée pour les %n dossier(s) configuré(s).</numerusform><numerusform>Synchronisation démarrée pour les %n dossier(s) configuré(s). </numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Ouvrir %1 dans le navigateur</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Calcul du quota...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Statut inconnu</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Paramètres...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Détails...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Aide</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Quitter %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Ouvrir le répertoire %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% de %2 occupés</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>À jour</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Aucun.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Modifications récentes</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Répertoires suivis :</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Ouvrir le dossier &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Quota n/a</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Aucun item synchronisé récemment</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Synchronisation %1 de %2 (%3 de %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Dossier %1 : %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Aucun répertoire synchronisé n&apos;est configuré.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Veuillez mettre à jour avec la dernière version du serveur et redémarrer le client.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>Les informations d&apos;identification fournies ne sont pas correctes</translation>
     </message>
@@ -1641,6 +1533,119 @@ conflits et le fichier côté serveur est disponible sous son nom original.</tra
         <translation>Obtenir la mise à jour</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 32e43a16f..601cffa2f 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -229,119 +229,6 @@
         <translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>Comezou a sincronización %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Comezou a sincronización para %n cartafol con sincronización configurada.</numerusform><numerusform>Comezou a sincronización para %n cartafoles con sincronización configurada.</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Abrir %1 nun navegador</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Calculando a cota...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Estado descoñecido</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Axustes...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Detalles...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Axuda</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Saír de %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Abrir o cartafol %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>Usado %1% de %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Actualizado</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Nada.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Cambios recentes</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Cartafoles xestionados:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Abrir o cartafol «%1»</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Cota n/d</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Non hai elementos sincronizados recentemente</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Cartafol %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Non se configuraron cartafoles de sincronización.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Actualice ao último servidor e reinicie o cliente.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>As credenciais fornecidas non son correctas</translation>
     </message>
@@ -1642,6 +1534,119 @@ o nome orixinal</translation>
         <translation>Obter a actualización</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index fdac77638..70340299d 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 szinkronizálás elindult</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Kvóta kiszámítása...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Ismeretlen állapot</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Beállítások...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Részletek...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Súgó</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Frissítve</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Legutóbbi változások</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Kezelt mappák:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Kvóta n/a</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Mappa %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Nincsenek megadva szinkronizálandó mappák.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>Frissítés beszerzése</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 5eda10bdd..c40be1b26 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -229,119 +229,6 @@
         <translation>Non ci sono informazioni disponibili sull&apos;utilizzo dello spazio di archiviazione.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Sincronizzazione iniziata</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Sincronizzazione avviata per %n cartella configurata.</numerusform><numerusform>Sincronizzazione avviata per %n cartelle configurate.</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Apri %1 nel browser...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Calcolo quota in corso...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Stato sconosciuto</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Impostazioni...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Dettagli...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Aiuto</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Esci da %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Apri la cartella %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% di %2 utilizzati</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Aggiornato</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Nessuna.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Modifiche recenti</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Cartelle gestite:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Apri la cartella &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Quota n/d</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Nessun elemento sincronizzato di recente</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Sincronizzazione di %1 di %2 (%3 di %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Cartella %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Nessuna cartella configurata per la sincronizzazione.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Aggiorna all&apos;ultima versione del server e riavvia il client.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>Le credenziali fornite non sono corrette</translation>
     </message>
@@ -1641,6 +1533,119 @@ conflitto, mentre il file sul server è disponibile con il nome originale</trans
         <translation>Ottieni l&apos;aggiornamento</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 4a4c147c2..4cb7f1d8f 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -229,119 +229,6 @@
         <translation>現在、利用できるストレージ使用情報はありません。</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 同期開始</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>設定された %n フォルダの同期を開始しました。</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>%1 をブラウザーで開く</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>制限容量を計算中...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>不明な状態</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>詳細...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>ヘルプ</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>%1 を終了</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>%1 フォルダを開く</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%2 のうち %1% を使用中</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>最近です</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>なし</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>最近変更されたファイル</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>管理フォルダ:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>フォルダ ’%1’ を開く</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>クオータ n/a</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>最近同期されたアイテムはありません。</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>%2 の %1 (%4 分の %3) を同期中</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>フォルダ %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>同期フォルダが設定されていません。</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>サーバーを最新に更新して、クライアントを再起動してください。</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>与えられた認証情報が正しくありません。</translation>
     </message>
@@ -1637,6 +1529,119 @@ name</source>
         <translation>更新を取得</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 6804ccf3a..56ce82eee 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -229,119 +229,6 @@
         <translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Synchronisatie gestart</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Synchronisatie begonnen voor %n geconfigureerde synchronisatie map(pen).</numerusform><numerusform>Synchronisatie begonnen voor %n geconfigureerde synchronisatie map(pen).</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Open %1 in browser</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Quota worden berekend ...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Onbekende status</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Instellingen...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Details ...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Help</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>%1 afsluiten</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Open %1 map</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% van %2 gebruikt</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Bijgewerkt</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Geen.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Recente wijzigingen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Beheerde mappen:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Open map &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Quota niet beschikbaar</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Recent niets gesynchroniseerd</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Synchroniseert %1 van %2 (%3 van %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Map %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Geen synchronisatie-mappen geconfigureerd.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Werk update de server naar de nieuwste versie en herstart het programma.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>De verstrekte inloggegevens zijn niet juist</translation>
     </message>
@@ -1643,6 +1535,119 @@ op de server staat beschikbaar blijft met de originele naam.</translation>
         <translation>Ophalen update</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 3d0341669..3abfa7af8 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Synchronizacja rozpoczęta</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Synchronizacja rozpoczęta dla %n folderu(ów).</numerusform><numerusform>Synchronizacja rozpoczęta dla %n folderu(ów).</numerusform><numerusform>Synchronizacja rozpoczęta dla %n folderu(ów).</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Otwórz %1 w przeglądarce</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Obliczam quote...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Nieznany status</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Ustawienia...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Szczegóły...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Pomoc</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Wyjdź %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Otwórz folder %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% z %2 w użyciu</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Aktualne</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Brak.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Ostatnie zmiany</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Zarządzane foldery:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Otwórz katalog &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Quota n/a</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Brak ostatnich synchronizacji</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Synchronizacja %1 z %2 (%3 z %4)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Folder %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Nie skonfigurowano synchronizowanych folderów.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>Uaktualnij</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 3a8f49bda..ff9257d9a 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 A sincronização inicou.</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Ajuda</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Abrir a pasta %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Actualizado</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Pastas Geridas:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Nenhuma pasta de sincronização configurada.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -510,7 +397,12 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1628,6 +1520,119 @@ name</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index b21520f7c..0907fc4c3 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -229,119 +229,6 @@
         <translation>Atualmente, não há informações de uso de armazenamento disponível.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Sincronização Iniciada</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Sincronização iniciada para %n pasta(s) configurada(s).</numerusform><numerusform>Sincronização iniciada para %n pasta(s) configurada(s).</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Abrir %1 no navegador</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Calculando cota...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Status desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Configurações...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Detalhes...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Ajuda</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Sair %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Abrir pasta %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% de %2 em uso</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Até a data</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Nenhum.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Alterações Recentes</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Pastas Gerenciadas:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Abrir pasta &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Cota n/a</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Não há itens sincronizados recentemente</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Sincronizando %1 de %2 (%3 de %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Pasta %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Pastas de sincronização não configuradas.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Por favor, atualize para o último servidor e reinicie o cliente.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>As credenciais fornecidas não estão corretas</translation>
     </message>
@@ -1640,6 +1532,119 @@ enquanto o arquivo do lado do servidor está disponível sob o nome original</tr
         <translation>Atualizar</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index e39f593d9..e895c7297 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -229,119 +229,6 @@
         <translation>В данный момент информация о заполненности хранилища недоступна.</translation>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Синхронизация начата</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Синхронизация начата для %n выбранной папки.</numerusform><numerusform>Синхронизация начата для %n выбранных папки(ок).</numerusform><numerusform>Синхронизация начата для %n выбранных папки(ок).</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Открыть %1 в браузере</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Расчёт квоты...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Неизвестный статус</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Настройки...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Детали...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Помощь</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Выход %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Открыть %1 папку</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>Используется %1% из %2.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Актуальная версия</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Пусто</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Недавние изменения</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Управляемые папки:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Открыть папку &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Квота недоступна</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Недавно ничего не синхронизировалсь</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Синхронизируются  %1 из %2 (%3 из %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Папка %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Нет папок для синхронизации.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation>Пожалуйста, обновите сервер до последней версии и перезапустите клиент.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation>Введённые учётные данные не верны</translation>
     </message>
@@ -1643,6 +1535,119 @@ name</source>
         <translation>Получить обновление</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 59102a85c..7b566a4cf 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Synchronizácia začala</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Otvoriť %1 v prehliadači</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Kalkulovanie kvóty...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Neznámy stav</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Nastavenia...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Detaily...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Pomoc</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Ukončiť %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Otvoriť %1 adresár</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% z %2 v používaní</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Až do dnešného dňa</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Žiaden.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Nedávne zmeny</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Spravované priečinky:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Otvoriť priečinok &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Kvóta n/a</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Žiadne nedávno synchronizované položky</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Synchronizovanie %1 z %2 (%3 z %4)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Priečinok %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Nenastavené žiadne synchronizačné priečinky.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1636,6 +1528,119 @@ súboru, pokým súbor zo strany servera je dostupný z originálnym názvom</tr
         <translation>Aktualizovať teraz</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 2ecbc37fd..3a8f166c7 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>Usklajevanje %1 je začeto</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Preračunavanje kvote...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Neznan status</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Nastavitve...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Pomoč</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Odpri %1 mapo</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Ni posodobitev</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Upravljane mape:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Mapa %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Ni nastavljenih map za usklajevanje.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>Pridobi posodobitve</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 25dc7199a..7830eac4f 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 Synk startad</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>Synkronisering startad för %n konfigurerade synk-katalog(er).</numerusform><numerusform>Synkronisering startad för %n konfigurerade synk-katalog(er).</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>Öppna %1 i webbläsaren</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation>Beräknar kvot...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation>Okänd status</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation>Inställningar...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation>Detaljer...</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Hjälp</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation>Avsluta %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Öppna %1 mappen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation>%1% av %2 används</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>Aktuell version</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation>Ingen.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation>Senaste ändringar</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Hanterade mappar:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation>Öppna mapp &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation>Kvot n/a</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation>Inga filer har synkroniseras nyligen</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation>%1 (%2, %3)</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation>Synkar %1 av %2 (%3 av %4) </translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>Mapp %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Ingen synkroniseringsmapp är konfigurerad.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1638,6 +1530,119 @@ medan filen från serversidan är tillgänglig under originalnamnet</translation
         <translation>Hämta uppdatering</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 5d53b0c91..0dae24cb5 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>การซิงค์ข้อมูล %1 เริ่มต้นแล้ว</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>ช่วยเหลือ</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>เปิดโฟลเดอร์ %1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการซิงค์ข้อมูล</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index ea9c3f43d..3cbaa9b99 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 синхронізація розпочата</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>Допомога</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>Відкрити %1 каталог</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>Керовані теки:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>Жодна тека не налаштована для синхронізації.</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 4daa25541..89cf5ea33 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1 同步已启动</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation><numerusform>开始同步 %n 个已配置的同步文件夹。</numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation>在浏览器中打开%1</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>帮助</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>打开 %1 目录</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>更新</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>管理的文件夹：</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>文件夹 %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>没有已配置的同步文件夹。</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>获取更新</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 9630f0bb8..bbcefabd6 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -229,119 +229,6 @@
         <translation type="unfinished"/>
     </message>
 </context>
-<context>
-    <name>Mirall::Application</name>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="262"/>
-        <source>%1 Sync Started</source>
-        <translation>%1同步已經開始</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/mirall/application.cpp" line="263"/>
-        <source>Sync started for %n configured sync folder(s).</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="336"/>
-        <source>Open %1 in browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="338"/>
-        <source>Calculating quota...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="340"/>
-        <source>Unknown status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="342"/>
-        <source>Settings...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="343"/>
-        <source>Details...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="348"/>
-        <source>Help</source>
-        <translation>說明</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="350"/>
-        <source>Quit %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="400"/>
-        <source>Open %1 folder</source>
-        <translation>開啟%1資料夾</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="548"/>
-        <source>%1% of %2 in use</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="620"/>
-        <source>Up to date</source>
-        <translation>最新的</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="379"/>
-        <source>None.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="383"/>
-        <source>Recent Changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="410"/>
-        <source>Managed Folders:</source>
-        <translation>管理的資料夾:</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="413"/>
-        <source>Open folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="541"/>
-        <source>Quota n/a</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="574"/>
-        <source>No items synced recently</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="583"/>
-        <source>%1 (%2, %3)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="598"/>
-        <source>Syncing %1 of %2 (%3 of %4) </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="845"/>
-        <source>Folder %1: %2</source>
-        <translation>資料夾 %1: %2</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/application.cpp" line="851"/>
-        <source>No sync folders configured.</source>
-        <translation>尚未指定同步資料夾</translation>
-    </message>
-</context>
 <context>
     <name>Mirall::CSyncThread</name>
     <message>
@@ -509,7 +396,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/mirall/connectionvalidator.cpp" line="155"/>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="132"/>
+        <source>Unable to connect to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/connectionvalidator.cpp" line="156"/>
         <source>The provided credentials are not correct</source>
         <translation type="unfinished"/>
     </message>
@@ -1627,6 +1519,119 @@ name</source>
         <translation>取得更新</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::ownCloudGui</name>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="131"/>
+        <source>%1 Sync Started</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/mirall/owncloudgui.cpp" line="132"/>
+        <source>Sync started for %n configured sync folder(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="163"/>
+        <source>Folder %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="169"/>
+        <source>No sync folders configured.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="188"/>
+        <source>None.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="192"/>
+        <source>Recent Changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="209"/>
+        <source>Open %1 folder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="219"/>
+        <source>Managed Folders:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="222"/>
+        <source>Open folder &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="288"/>
+        <source>Open %1 in browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="290"/>
+        <source>Calculating quota...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="292"/>
+        <source>Unknown status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="294"/>
+        <source>Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="295"/>
+        <source>Details...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="300"/>
+        <source>Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="302"/>
+        <source>Quit %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="312"/>
+        <source>Quota n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="319"/>
+        <source>%1% of %2 in use</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="340"/>
+        <source>No items synced recently</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="349"/>
+        <source>%1 (%2, %3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="365"/>
+        <source>Syncing %1 of %2 (%3 of %4) </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudgui.cpp" line="387"/>
+        <source>Up to date</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Mirall::ownCloudInfo</name>
     <message>