diff --git a/src/mirall/folderwizardsourcepage.ui b/src/mirall/folderwizardsourcepage.ui
index 0b3d199e50..2488212d02 100644
--- a/src/mirall/folderwizardsourcepage.ui
+++ b/src/mirall/folderwizardsourcepage.ui
@@ -22,14 +22,14 @@
       </font>
      </property>
      <property name="text">
-      <string>Express Upload Source</string>
+      <string>Sync Directory</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Pick a folder on your computer to upload:</string>
+      <string>Pick a local folder on your computer to sync:</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
@@ -147,7 +147,7 @@
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="text">
-      <string>TextLabel</string>
+      <string/>
      </property>
      <property name="textFormat">
       <enum>Qt::AutoText</enum>
diff --git a/src/mirall/folderwizardtargetpage.ui b/src/mirall/folderwizardtargetpage.ui
index 44f1408629..8b646c7210 100644
--- a/src/mirall/folderwizardtargetpage.ui
+++ b/src/mirall/folderwizardtargetpage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>456</width>
-    <height>352</height>
+    <width>454</width>
+    <height>321</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/mirall/owncloudcredentialspage.ui b/src/mirall/owncloudcredentialspage.ui
index c64f239819..2484e179c6 100644
--- a/src/mirall/owncloudcredentialspage.ui
+++ b/src/mirall/owncloudcredentialspage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>576</width>
-    <height>374</height>
+    <height>353</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -57,10 +57,10 @@
          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;Provide the credentials to your ownCloud Instance. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;If the ownCloud is created this is the admin account of your ownCloud. If you want to connect to an existing ownCloud, provide your account data.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#585858;&quot;&gt;Provide username and password to connect your ownCloud Instance. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#585858;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#585858;&quot;&gt;If you do not want to store the credentials on your local machine, check the button. ownCloud will ask you for the passwort on every start than.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="textFormat">
          <enum>Qt::AutoText</enum>
diff --git a/src/mirall/statusdialog.cpp b/src/mirall/statusdialog.cpp
index dbda525844..2ce944836e 100644
--- a/src/mirall/statusdialog.cpp
+++ b/src/mirall/statusdialog.cpp
@@ -111,9 +111,9 @@ void FolderViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
   QString aliasText = qvariant_cast<QString>(index.data(FolderAliasRole));
   QString pathText = qvariant_cast<QString>(index.data(FolderPathRole));
   QString remotePath = qvariant_cast<QString>(index.data(FolderSecondPathRole));
-  QString statusText = qvariant_cast<QString>(index.data(FolderStatus));
+  // QString statusText = qvariant_cast<QString>(index.data(FolderStatus));
   bool syncEnabled = index.data(FolderSyncEnabled).toBool();
-  QString syncStatus = syncEnabled? tr( "Enabled" ) : tr( "Disabled" );
+  // QString syncStatus = syncEnabled? tr( "Enabled" ) : tr( "Disabled" );
 
   QSize iconsize(48,48); //  = icon.actualSize(option.decorationSize);
 
diff --git a/src/mirall/statusdialog.ui b/src/mirall/statusdialog.ui
index b5206a61f4..d7199ed640 100644
--- a/src/mirall/statusdialog.ui
+++ b/src/mirall/statusdialog.ui
@@ -22,7 +22,7 @@
       </font>
      </property>
      <property name="text">
-      <string>Directory Status</string>
+      <string>Sync Directory Status</string>
      </property>
     </widget>
    </item>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index f2c5b9a726..ae3dbb0f6c 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -143,14 +143,22 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/>
         <source>Express Upload Source</source>
-        <translation>Express-Uploadquelle</translation>
+        <translation type="obsolete">Express-Uploadquelle</translation>
+    </message>
+    <message>
+        <source>Pick a folder on your computer to upload:</source>
+        <translation type="obsolete">Verzeichnis auf lokalem Rechner zum Upload auswählen:</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/folderwizardsourcepage.ui" line="25"/>
+        <source>Sync Directory</source>
+        <translation>Sync-Verzeichnis</translation>
     </message>
     <message>
         <location filename="../src/mirall/folderwizardsourcepage.ui" line="32"/>
-        <source>Pick a folder on your computer to upload:</source>
-        <translation>Verzeichnis auf lokalem Rechner zum Upload auswählen:</translation>
+        <source>Pick a local folder on your computer to sync:</source>
+        <translation>Wählen Sie ein lokales Verzeichnis zur Synchronisation:</translation>
     </message>
     <message>
         <location filename="../src/mirall/folderwizardsourcepage.ui" line="40"/>
@@ -172,11 +180,6 @@ p, li { white-space: pre-wrap; }
         <source>Music</source>
         <translation>Musik</translation>
     </message>
-    <message>
-        <location filename="../src/mirall/folderwizardsourcepage.ui" line="150"/>
-        <source>TextLabel</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>FolderWizardTargetPage</name>
@@ -261,32 +264,32 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Mirall::Application</name>
     <message>
-        <location filename="../src/mirall/application.cpp" line="222"/>
+        <location filename="../src/mirall/application.cpp" line="251"/>
         <source>Add folder...</source>
         <translation>Hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="224"/>
+        <location filename="../src/mirall/application.cpp" line="253"/>
         <source>Configure...</source>
         <translation>Einstellen...</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="228"/>
+        <location filename="../src/mirall/application.cpp" line="257"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="257"/>
+        <location filename="../src/mirall/application.cpp" line="288"/>
         <source>open %1</source>
         <translation>%1 öffnen</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="397"/>
         <source>Confirm Folder Remove</source>
         <translation>Bestätigung Verzeichnis Löschen</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="366"/>
+        <location filename="../src/mirall/application.cpp" line="397"/>
         <source>Do you really want to remove upload folder &lt;i&gt;%1&lt;/i&gt;?</source>
         <translation>Möchten Sie wirklich das Sync-Verzeichnis &lt;i&gt;%1&lt;/i&gt; löschen?</translation>
     </message>
@@ -307,9 +310,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Möchten Sie wirklich das Verzeichnis mit dem Alias &lt;i&gt;%1&lt;/i&gt; auf die ownCloud laden?&lt;br/&gt;Das wird die Dateien im Verzeichnis &lt;i&gt;%2&lt;/i&gt; überschreiben!</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="411"/>
         <source>Last sync was succesful</source>
-        <translation>Die letzte Synchronisierung war erfolgreich</translation>
+        <translation type="obsolete">Die letzte Synchronisierung war erfolgreich</translation>
     </message>
     <message>
         <source>%1</source>
@@ -324,97 +326,140 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Unbekannter Status</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="208"/>
+        <location filename="../src/mirall/application.cpp" line="237"/>
         <source>ownCloud Sync Started</source>
         <translation>ownCloud Sync ist gestartet</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="208"/>
+        <location filename="../src/mirall/application.cpp" line="237"/>
         <source>Sync started for %1 configured sync folder(s).</source>
         <translation>Synchronisation gestart für %1 Verzeichniss(e).</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="179"/>
-        <location filename="../src/mirall/application.cpp" line="196"/>
+        <location filename="../src/mirall/application.cpp" line="217"/>
+        <location filename="../src/mirall/application.cpp" line="224"/>
         <source>No ownCloud Connection</source>
         <translation>Keine Verbindung zu ownCloud</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="180"/>
         <source>There is no ownCloud connection available. Please configure one by clicking on the tray icon!</source>
-        <translation>Es besteht keine ownCloud Verbindung. Bitte konfigurieren Sie eine durch Klicken auf das Icon in der Systemleiste!</translation>
+        <translation type="obsolete">Es besteht keine ownCloud Verbindung. Bitte konfigurieren Sie eine durch Klicken auf das Icon in der Systemleiste!</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="197"/>
         <source>Your ownCloud credentials are not correct. Please correct them by clicking on the tray icon!</source>
-        <translation>Der ownCloud Nutzer oder das Passwort ist falsch. Bitte korrigieren Sie das durch Klicken auf das Symbol in der Systemleiste!</translation>
+        <translation type="obsolete">Der ownCloud Nutzer oder das Passwort ist falsch. Bitte korrigieren Sie das durch Klicken auf das Symbol in der Systemleiste!</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="415"/>
+        <location filename="../src/mirall/application.cpp" line="173"/>
+        <source>No ownCloud Configuration</source>
+        <translation>ownCloud Konfiguration nicht vorhanden</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="174"/>
+        <source>&lt;p&gt;No ownCloud connection was configured yet.&lt;/p&gt;&lt;p&gt;Please configure one by clicking on the tray icon!&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Es wurde bisher keine Verbindung zur ownCloud konfiguriert.&lt;/p&gt;&lt;p&gt;Bitte richten Sie eine ein durch Klicken auf das ownCloud-Symbol in der Systemleiste.&lt;/p&gt; </translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="195"/>
+        <source>&lt;p&gt;The ownCloud at %1 could not be reached.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Unter %1 konnte keine ownCloud erreicht werden.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="196"/>
+        <source>&lt;p&gt;The detailed error message is&lt;br/&gt;&lt;tt&gt;%1&lt;/tt&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die detaillierte Fehlermeldung ist &lt;br/&gt;&lt;tt&gt;%1&lt;/tt&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="198"/>
+        <source>&lt;p&gt;Please check your configuration by clicking on the tray icon.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Bitte überprüfen Sie die Konfiguration durch Klicken auf das Symbol in der Systemleiste.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="200"/>
+        <source>ownCloud Connection Failed</source>
+        <translation>ownCloud-Verbindung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="218"/>
+        <source>&lt;p&gt;Your ownCloud credentials are not correct.&lt;/p&gt;&lt;p&gt;Please correct them by starting the configuration dialog from the tray!&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die ownCloud Benutzerdaten sind nicht korrekt&lt;/p&gt;&lt;p&gt;Bitte korrigieren Sie sie im Konfigurationsdialog.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="225"/>
+        <source>&lt;p&gt;Your ownCloud user name or password is not correct.&lt;/p&gt;&lt;p&gt;Please correct it by starting the configuration dialog from the tray!&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Der ownCloud Benutzername oder das Passwort sind nicht richtig.&lt;/p&gt;&lt;p&gt;Bitte korrigieren Sie das im Konfigurationsdialog.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="442"/>
+        <source>Last sync was succesful.</source>
+        <translation>Die letzte Synchronisation war erfolgreich.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/application.cpp" line="446"/>
         <source>&lt;b&gt;Syncing Error&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;Synchronisationsfehler&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="417"/>
+        <location filename="../src/mirall/application.cpp" line="448"/>
         <source>&lt;b&gt;Setup Error&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;Installationsfehler&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="419"/>
+        <location filename="../src/mirall/application.cpp" line="450"/>
         <source>&lt;b&gt;Disabled Folder&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;Deaktiviertes Verzeichnis&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="421"/>
+        <location filename="../src/mirall/application.cpp" line="452"/>
         <source>&lt;b&gt;Undefined state&lt;/b&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;Undefinierter Status&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="424"/>
+        <location filename="../src/mirall/application.cpp" line="455"/>
         <source>Folder information</source>
         <translation>Verzeichnis Information</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="439"/>
+        <location filename="../src/mirall/application.cpp" line="470"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="441"/>
+        <location filename="../src/mirall/application.cpp" line="472"/>
         <source>Changed files:
 </source>
         <translation>Geänderte Dateien:</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="443"/>
+        <location filename="../src/mirall/application.cpp" line="474"/>
         <source>Added files:
 </source>
         <translation>Hinzugefügte Dateien:</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="445"/>
+        <location filename="../src/mirall/application.cpp" line="476"/>
         <source>New files in the server, or files deleted locally:
 </source>
         <translation>Neue Dateien auf dem Server, oder lokal gelöschte Dateien:</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="500"/>
+        <location filename="../src/mirall/application.cpp" line="536"/>
         <source>Folder %1: Ok.</source>
         <translation>Verzeichnis %1: Ok.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="503"/>
-        <location filename="../src/mirall/application.cpp" line="514"/>
+        <location filename="../src/mirall/application.cpp" line="539"/>
+        <location filename="../src/mirall/application.cpp" line="550"/>
         <source>Folder %1: %2</source>
         <translation>Verzeichnis %1: %2</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="508"/>
+        <location filename="../src/mirall/application.cpp" line="544"/>
         <source>Folder %1: setup error</source>
         <translation>Verzeichnis %1: Konfigurationsfehler</translation>
     </message>
     <message>
-        <location filename="../src/mirall/application.cpp" line="519"/>
+        <location filename="../src/mirall/application.cpp" line="555"/>
         <source>Folder %1: undefined state</source>
         <translation>Verzeichnis %1: Unbekannter Fehler</translation>
     </message>
@@ -458,45 +503,60 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/mirall/csyncthread.cpp" line="197"/>
+        <source>&lt;p&gt;The target directory %1 does not exist.&lt;/p&gt;&lt;p&gt;Please create it and try again.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Das Zielverzeichnis %1 existiert nicht.&lt;/p&gt;&lt;p&gt;Bitte legen Sie es an und versuchen Sie erneut.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/csyncthread.cpp" line="201"/>
+        <source>The local filesystem can not be written. Please check permissions.</source>
+        <translation>Das lokale Dateisystem kann nicht beschrieben werden. Bitte Berechtigungen prüfen.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/csyncthread.cpp" line="205"/>
+        <source>A remote file can not be written. Please check the remote access.</source>
+        <translation>Auf der ownCloud kann keine Datei angelegt werden. Bitte überprüfen Sie den Zugang.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/csyncthread.cpp" line="208"/>
         <source>An internal error number %1 happend.</source>
         <translation>Ein interner Fehler mit Nummer %1 ist vorgekommen.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/csyncthread.cpp" line="206"/>
+        <location filename="../src/mirall/csyncthread.cpp" line="217"/>
         <source>CSync Update failed.</source>
         <translation>CSync Aktualisierung ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/csyncthread.cpp" line="217"/>
+        <location filename="../src/mirall/csyncthread.cpp" line="228"/>
         <source>The local filesystem has directories which are write protected.
 That prevents ownCloud from successful syncing.
 Please make sure that all directories are writeable.</source>
         <translation>Das lokale Dateisystem hat Verzeichnisse, die schreibgeschützt sind. Das verhindert erfolgreiche Synchronisation zur ownCloud. Bitte stellen Sie sicher, dass alle Verzeichnisse beschreibbar sind.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/csyncthread.cpp" line="221"/>
+        <location filename="../src/mirall/csyncthread.cpp" line="232"/>
         <source>CSync encountered an error while examining the file system.
 Syncing is not possible.</source>
         <translation>CSync konnte das Dateisystem nicht fehlerfrei durchsuchen. Synchronisation ist nicht möglich.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/csyncthread.cpp" line="224"/>
+        <location filename="../src/mirall/csyncthread.cpp" line="235"/>
         <source>CSync update generated a strange instruction.
 Please write a bug report.</source>
         <translation>CSync Aktualisierung erzeugte eine unbekannte Anweisung. Bitte schreiben Sie einen Fehlerreport.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/csyncthread.cpp" line="227"/>
+        <location filename="../src/mirall/csyncthread.cpp" line="238"/>
         <source>Local filesystem problems. Better disable Syncing and check.</source>
         <translation>Fehler im lokalen Dateisystem. Synchronisation sollte deaktiviert werden.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/csyncthread.cpp" line="245"/>
+        <location filename="../src/mirall/csyncthread.cpp" line="256"/>
         <source>CSync reconcile failed.</source>
         <translation>CSync Vergleich fehlerhaft.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/csyncthread.cpp" line="249"/>
+        <location filename="../src/mirall/csyncthread.cpp" line="260"/>
         <source>CSync propagate failed.</source>
         <translation>CSync Abgleich fehlerhaft.</translation>
     </message>
@@ -504,14 +564,12 @@ Please write a bug report.</source>
 <context>
     <name>Mirall::FolderViewDelegate</name>
     <message>
-        <location filename="../src/mirall/statusdialog.cpp" line="116"/>
         <source>Enabled</source>
-        <translation>Aktiviert</translation>
+        <translation type="obsolete">Aktiviert</translation>
     </message>
     <message>
-        <location filename="../src/mirall/statusdialog.cpp" line="116"/>
         <source>Disabled</source>
-        <translation>Angehalten</translation>
+        <translation type="obsolete">Angehalten</translation>
     </message>
     <message>
         <location filename="../src/mirall/statusdialog.cpp" line="150"/>
@@ -522,7 +580,7 @@ Please write a bug report.</source>
 <context>
     <name>Mirall::FolderWizard</name>
     <message>
-        <location filename="../src/mirall/folderwizard.cpp" line="466"/>
+        <location filename="../src/mirall/folderwizard.cpp" line="455"/>
         <source>%1 Folder Wizard</source>
         <translation>%1 Verzeichnis Assistent</translation>
     </message>
@@ -568,37 +626,42 @@ Please write a bug report.</source>
 <context>
     <name>Mirall::FolderWizardTargetPage</name>
     <message>
-        <location filename="../src/mirall/folderwizard.cpp" line="207"/>
+        <location filename="../src/mirall/folderwizard.cpp" line="209"/>
         <source>The folder is not available on your ownCloud.&lt;br/&gt;Click to let mirall create it.</source>
         <translation>Das Verzeichnis ist auf der ownCloud nicht verfügbar.&lt;br/&gt;Klicken um es anlegen zu lassen.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/folderwizard.cpp" line="246"/>
+        <location filename="../src/mirall/folderwizard.cpp" line="234"/>
         <source>Folder on ownCloud was successfully created.</source>
         <translation>Das Verzeichnis wurde erfolgreich auf der ownCloud angelegt.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/folderwizard.cpp" line="249"/>
+        <location filename="../src/mirall/folderwizard.cpp" line="237"/>
         <source>Failed to create the folder on ownCloud.&lt;br/&gt;Please check manually.</source>
         <translation>Anlegen des Verzeichnisses auf der ownCloud fehlgeschlagen.&lt;br/&gt;Bitte überprüfen Sie manuell.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/folderwizard.cpp" line="269"/>
+        <location filename="../src/mirall/folderwizard.cpp" line="257"/>
         <source>Better do not use the remote root directory.&lt;br/&gt;If you do, you can &lt;b&gt;not&lt;/b&gt; mirror another local folder.</source>
         <translation>Wählen Sie besser nicht das ownCloud root Verzeichnis aus.&lt;br/&gt;Wenn Sie dieses wählen, können Sie &lt;b&gt;kein&lt;/b&gt; weiteres Verzeichnis synchronisieren.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/folderwizard.cpp" line="314"/>
+        <location filename="../src/mirall/folderwizard.cpp" line="302"/>
         <source>to your &lt;a href=&quot;%1&quot;&gt;ownCloud&lt;/a&gt; (version %2)</source>
         <translation>zur &lt;a href=&quot;%1&quot;&gt;ownCloud&lt;/a&gt; (version %2)</translation>
     </message>
     <message>
-        <location filename="../src/mirall/folderwizard.cpp" line="324"/>
+        <location filename="../src/mirall/folderwizard.cpp" line="312"/>
         <source>no configured ownCloud found!</source>
         <translation>keine eingerichtete ownCloud verfügbar!</translation>
     </message>
     <message>
-        <location filename="../src/mirall/folderwizard.cpp" line="396"/>
+        <location filename="../src/mirall/folderwizard.cpp" line="313"/>
+        <source>Your ownCloud could not be reached:&lt;br/&gt;&lt;tt&gt;%1&lt;/tt&gt;</source>
+        <translation>Die ownCloud kann nicht erreicht werden: &lt;br/&gt;&lt;tt&gt;%1&lt;/tt&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/folderwizard.cpp" line="385"/>
         <source>Select the target folder</source>
         <translation>Wählen Sie den Zielordner</translation>
     </message>
@@ -606,145 +669,228 @@ Please write a bug report.</source>
 <context>
     <name>Mirall::OwncloudSetupWizard</name>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="72"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="71"/>
         <source>%1 Connection Wizard</source>
         <translation>%1 Verbindungsassistent</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="80"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="89"/>
         <source>Trying to connect to ownCloud at %1...</source>
         <translation>Versuche mit ownCloud %1zu verbinden... </translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="109"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="115"/>
         <source>&lt;font color=&quot;green&quot;&gt;Successfully connected to %1: ownCloud version %2&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</source>
         <translation>&lt;font color=&quot;green&quot;&gt;Erfolgreich verbunden mit %1: ownCloud Version %2&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="117"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="126"/>
         <source>&lt;font color=&quot;red&quot;&gt;Failed to connect to ownCloud!&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;red&quot;&gt;Verbindung zu ownCloud fehlgeschlagen!&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="118"/>
         <source>Error number %1</source>
-        <translation>Fehler Nummer %1</translation>
+        <translation type="obsolete">Fehler Nummer %1</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="204"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="127"/>
+        <source>Error: &lt;tt&gt;%1&lt;/tt&gt;</source>
+        <translation>Fehler: &lt;tt&gt;%1&lt;/tt&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="213"/>
         <source>Starting script owncloud-admin...</source>
         <translation>Starte das ownCloud-Admin Script...</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="255"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="264"/>
         <source>&lt;font color=&quot;red&quot;&gt;Installation of ownCloud failed!&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;red&quot;&gt;Installation der ownCloud fehlgeschlagen!&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="260"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="269"/>
         <source>&lt;font color=&quot;green&quot;&gt;Installation of ownCloud succeeded!&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;green&quot;&gt;Installation der ownCloud erfolgreich!&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="288"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="297"/>
         <source>The owncloud admin script can not be found.
 Setup can not be done.</source>
         <translation>Das ownCloud-Admin Script wurde nicht gefunden. Das Setup wird abgebrochen.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="301"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
         <source>Skipping automatic setup of sync folders as there are already sync folders.</source>
         <translation>Überspringe automatische Konfiguration von synchronisierten Verzeichnissen weil schon Synchronisationsverzeichnisse konfiguriert sind.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="307"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="316"/>
         <source>Checking local sync folder %1</source>
         <translation>Überprüfe lokales Verzeichnis %1</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
         <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
         <translation>Lokales Verzeichnis %1 existiert schon, wird zur Synchronisation eingerichtet.&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="324"/>
         <source>Creating local sync folder %1... </source>
         <translation>Erzeuge lokales Synchronisation-Verzeichnis %1...</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="326"/>
         <source>Creating local sync folder %1</source>
         <translation>Erzeuge lokales Synchronisationsverzeichnis %1</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="320"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="329"/>
         <source>ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="331"/>
         <source>failed.</source>
         <translation>fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
         <source>Start Creation of remote folder %1 failed.</source>
         <translation>Anlegen des entfernten Verzeichnisses %1 fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="371"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="367"/>
         <source>Remote folder %1 created sucessfully.</source>
         <translation>Entferntes Verzeichnis %1 erfolgreich angelegt.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="376"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="372"/>
         <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Lokales Synchronisationsverzeichnis %1 erfolgreich angelegt!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="379"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="375"/>
         <source>The remote folder %1 already exists. Automatic sync setup is skipped for security reasons. Please configure your sync folder manually.</source>
         <translation>Das entfernte Verzeichnis %1 existiert bereits. Darum wird kein automatisches Synchronisieren eingerichtet. Bitte konfigurieren Sie die Synchronisation manuell.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="382"/>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="377"/>
+        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Das Anlegen des ownCloud-Verzeichnisses schlug fehl, wahrscheinlich weil die Benutzerdaten falsch sind.&lt;/font&gt;&lt;br/&gt;Bitte berichtigen Sie die Benutzerdaten&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="380"/>
+        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
+        <translation>Anlegen des ownCloud-Verzeichisses %1 schlug fehl mit Fehler &lt;tt&gt;%2&lt;/tt&gt;</translation>
+    </message>
+    <message>
         <source>Remote folder %1 creation failed with error %2.</source>
-        <translation>Anlegen des entfernten Ordner %1ist mit Fehler %2 fehlgeschlagen. </translation>
+        <translation type="obsolete">Anlegen des entfernten Ordner %1ist mit Fehler %2 fehlgeschlagen. </translation>
     </message>
 </context>
 <context>
     <name>Mirall::OwncloudWizardResultPage</name>
     <message>
-        <location filename="../src/mirall/owncloudwizard.cpp" line="245"/>
+        <location filename="../src/mirall/owncloudwizard.cpp" line="257"/>
         <source>Congratulations! Your &lt;a href=&quot;%1&quot; title=&quot;%1&quot;&gt;new ownCloud&lt;/a&gt; is now up and running!</source>
         <translation>Herzlichen Glückwunsch! Ihre &lt;a href=&quot;%1&quot;&gt;neue ownCloud&lt;/a&gt; ist eingerichtet und läuft!</translation>
     </message>
 </context>
+<context>
+    <name>Mirall::SslErrorDialog</name>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="31"/>
+        <source>SSL Connection</source>
+        <translation>SSL-Verbindung</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="93"/>
+        <source>Warnings about current SSL Connection:</source>
+        <translation>Warnungen zur aktuellen SSL Verbindung: </translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="129"/>
+        <source>with Certificate %1</source>
+        <translation>mit Zertifikat %1</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="133"/>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="147"/>
+        <source>Organization: %1</source>
+        <translation>Organisation: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="134"/>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="148"/>
+        <source>Unit: %1</source>
+        <translation>Einheit: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="135"/>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="149"/>
+        <source>Country: %1</source>
+        <translation>Land: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="139"/>
+        <source>Effective Date: %1</source>
+        <translation>Startdatum: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="140"/>
+        <source>Expiry Date: %1</source>
+        <translation>Auslaufdatum: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrordialog.cpp" line="144"/>
+        <source>Issuer: %1</source>
+        <translation>Herausgeber: %1</translation>
+    </message>
+</context>
 <context>
     <name>Mirall::StatusDialog</name>
     <message>
-        <location filename="../src/mirall/statusdialog.cpp" line="226"/>
+        <location filename="../src/mirall/statusdialog.cpp" line="240"/>
         <source>disable</source>
         <translation>Sync stoppen</translation>
     </message>
     <message>
-        <location filename="../src/mirall/statusdialog.cpp" line="228"/>
+        <location filename="../src/mirall/statusdialog.cpp" line="242"/>
         <source>enable</source>
         <translation>Sync starten</translation>
     </message>
     <message>
-        <location filename="../src/mirall/statusdialog.cpp" line="402"/>
+        <location filename="../src/mirall/statusdialog.cpp" line="404"/>
+        <source>Checking ownCloud connection...</source>
+        <translation>Überprüfe ownCloud-Verbindung...</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/statusdialog.cpp" line="409"/>
+        <source>No ownCloud connection configured.</source>
+        <translation>ownCloud-Verbindung nicht eingerichtet.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/statusdialog.cpp" line="420"/>
         <source>Connected to &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;, ownCloud %3</source>
         <translation>Verbunden mit &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;, ownCloud %3</translation>
     </message>
+    <message>
+        <location filename="../src/mirall/statusdialog.cpp" line="427"/>
+        <source>unknown problem.</source>
+        <translation>unbekanntes Problem.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/statusdialog.cpp" line="430"/>
+        <source>&lt;p&gt;Failed to connect to ownCloud: &lt;tt&gt;%1&lt;/tt&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Verbindung zur ownCloud fehlgeschlagen: &lt;tt&gt;%1&lt;/tt&gt;&lt;/p&gt;</translation>
+    </message>
     <message>
         <source>Connected to %1, ownCloud %2</source>
         <translation type="obsolete">Verbunden mit %1, ownCloud %2</translation>
     </message>
     <message>
-        <location filename="../src/mirall/statusdialog.cpp" line="409"/>
         <source>Failed to connect to ownCloud. Please check configuration!</source>
-        <translation>ownCloud konnte nicht erreicht werden. Bitte überprüfen Sie die Konfiguration!</translation>
+        <translation type="obsolete">ownCloud konnte nicht erreicht werden. Bitte überprüfen Sie die Konfiguration!</translation>
     </message>
 </context>
 <context>
@@ -770,9 +916,13 @@ Setup can not be done.</source>
         <translation type="obsolete">Angehalten</translation>
     </message>
     <message>
-        <location filename="../src/mirall/theme.cpp" line="75"/>
         <source>Sync has not yet started</source>
-        <translation>Synchronisierung noch nicht gestartet</translation>
+        <translation type="obsolete">Synchronisierung noch nicht gestartet</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/theme.cpp" line="75"/>
+        <source>Waiting to start sync</source>
+        <translation>Warte auf Sync-Start</translation>
     </message>
     <message>
         <location filename="../src/mirall/theme.cpp" line="77"/>
@@ -812,17 +962,17 @@ Setup can not be done.</source>
 <context>
     <name>Mirall::UpdateDetector</name>
     <message>
-        <location filename="../src/mirall/updatedetector.cpp" line="98"/>
+        <location filename="../src/mirall/updatedetector.cpp" line="95"/>
         <source>Client Version Check</source>
         <translation>Client Versionsprüfung</translation>
     </message>
     <message>
-        <location filename="../src/mirall/updatedetector.cpp" line="100"/>
+        <location filename="../src/mirall/updatedetector.cpp" line="97"/>
         <source>&lt;p&gt;A new version of the ownCloud Client is available.</source>
         <translation>&lt;p&gt;Eine neue Version des ownCloud Clients ist verfügbar.</translation>
     </message>
     <message>
-        <location filename="../src/mirall/updatedetector.cpp" line="101"/>
+        <location filename="../src/mirall/updatedetector.cpp" line="98"/>
         <source>%1 is available. The installed version is %3.&lt;p/&gt;&lt;p&gt;For more information see &lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt;&lt;/p&gt;</source>
         <translation>%1 ist verfügbar. Die installierte Version ist %3.&lt;p/&gt;&lt;p&gt;Mehr Information unter &lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
@@ -830,7 +980,7 @@ Setup can not be done.</source>
 <context>
     <name>Mirall::ownCloudFolder</name>
     <message>
-        <location filename="../src/mirall/owncloudfolder.cpp" line="195"/>
+        <location filename="../src/mirall/owncloudfolder.cpp" line="203"/>
         <source>The CSync thread terminated unexpectedly.</source>
         <translation>Der CSync Thread ist unerwartet abgebrochen.</translation>
     </message>
@@ -853,7 +1003,6 @@ Setup can not be done.</source>
         <translation>Bitte ownCloud Zugangsdaten angeben</translation>
     </message>
     <message>
-        <location filename="../src/mirall/owncloudcredentialspage.ui" line="57"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -861,13 +1010,30 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;Provide the credentials to your ownCloud Instance. &lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;If the ownCloud is created this is the admin account of your ownCloud. If you want to connect to an existing ownCloud, provide your account data.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;Bitte die ownCloud Zugangsdaten angeben. &lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;Wird die ownCloud neu angelegt ist dies der admin Zugang zur ownCloud. Für die Verbindung zu einer bestehenden ownCloud bitte die Zugangsdaten angeben.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/owncloudcredentialspage.ui" line="57"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#585858;&quot;&gt;Provide username and password to connect your ownCloud Instance. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#585858;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#585858;&quot;&gt;If you do not want to store the credentials on your local machine, check the button. ownCloud will ask you for the passwort on every start than.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#585858;&quot;&gt;Geben Sie Benutzernamen und Passwort für die ownCloud-Verbindung an. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#585858;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#585858;&quot;&gt;Möchten Sie das Passwort nicht auf Ihrem Computer speichern, markieren Sie die Checkbox. ownCloud wird Sie dann bei jedem Start nach dem Passwort fragen.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../src/mirall/owncloudcredentialspage.ui" line="84"/>
@@ -889,6 +1055,11 @@ p, li { white-space: pre-wrap; }
         <source>secret</source>
         <translation>geheim</translation>
     </message>
+    <message>
+        <location filename="../src/mirall/owncloudcredentialspage.ui" line="121"/>
+        <source>Do not store password on local machine.</source>
+        <translation>Speichern des Passwortes auf dem lokalen Computer verbieten.</translation>
+    </message>
 </context>
 <context>
     <name>OwncloudFTPAccessPage</name>
@@ -1060,6 +1231,37 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;Der Dialog führt durch die notwendigen Schritte.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/mirall/mirallconfigfile.cpp" line="214"/>
+        <source>ownCloud Password Required</source>
+        <translation>ownCloud Passwort benötigt</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/mirallconfigfile.cpp" line="215"/>
+        <source>Please enter your ownCloud password:</source>
+        <translation>Bitte geben Sie Ihr ownCloud-Passwort an:</translation>
+    </message>
+</context>
+<context>
+    <name>sslErrorsDialog</name>
+    <message>
+        <location filename="../src/mirall/sslerrorsdialog.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrorsdialog.ui" line="20"/>
+        <source>Check if you want t continue via SSL and trust the shown certificates.</source>
+        <translation>Die Verbindung über SSL fortzusetzen und den angezeigten Zertifikaten zu vertrauen.</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/sslerrorsdialog.ui" line="39"/>
+        <source>SSL Connection</source>
+        <translation>SSL Verbindung</translation>
+    </message>
+</context>
 <context>
     <name>statusDialog</name>
     <message>
@@ -1068,9 +1270,13 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/mirall/statusdialog.ui" line="25"/>
         <source>Directory Status</source>
-        <translation>Status Verzeichnis</translation>
+        <translation type="obsolete">Status Verzeichnis</translation>
+    </message>
+    <message>
+        <location filename="../src/mirall/statusdialog.ui" line="25"/>
+        <source>Sync Directory Status</source>
+        <translation>Sync-Verzeichnis Status</translation>
     </message>
     <message>
         <location filename="../src/mirall/statusdialog.ui" line="39"/>