diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6ee609b6..f7843d5c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="at.bitfire.davdroid"
-    android:versionCode="44"
-    android:versionName="0.6.6" android:installLocation="internalOnly">
+    android:versionCode="45"
+    android:versionName="0.6.7" android:installLocation="internalOnly">
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/res/layout/account_details.xml b/res/layout/account_details.xml
index 9017ed15..c849c572 100644
--- a/res/layout/account_details.xml
+++ b/res/layout/account_details.xml
@@ -16,18 +16,18 @@
             android:layout_columnSpan="2"
             android:layout_gravity="left"
             android:layout_marginBottom="20dp"
-            android:text="@string/account_details"
+            android:text="@string/setup_account_details"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <TextView
             android:layout_gravity="left"
-            android:text="@string/account_name"
+            android:text="@string/setup_account_name"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <EditText
             android:id="@+id/account_name"
             android:layout_gravity="fill_horizontal"
-            android:hint="@string/account_name_hint"
+            android:hint="@string/setup_account_name_hint"
             android:inputType="textEmailAddress" />
         
         <TextView
@@ -38,7 +38,7 @@
             android:drawableLeft="@drawable/extra_actions_about"
             android:drawablePadding="10dp"
             android:padding="10dp"
-            android:text="@string/account_name_info"
+            android:text="@string/setup_account_name_info"
             android:textAppearance="?android:attr/textAppearanceMedium" />
         
         <Space
diff --git a/res/layout/address_books_heading.xml b/res/layout/address_books_heading.xml
index a8e5136d..eae9a503 100644
--- a/res/layout/address_books_heading.xml
+++ b/res/layout/address_books_heading.xml
@@ -8,13 +8,13 @@
         style="@style/TextView.Heading"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="@string/address_books" />
+        android:text="@string/setup_address_books" />
 
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
         android:layout_marginTop="10dp"
-        android:text="@string/select_address_book" />
+        android:text="@string/setup_select_address_book" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/calendars_heading.xml b/res/layout/calendars_heading.xml
index 7ad3164e..7a4a5c6f 100644
--- a/res/layout/calendars_heading.xml
+++ b/res/layout/calendars_heading.xml
@@ -9,13 +9,13 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="@string/calendars" />
+        android:text="@string/setup_calendars" />
 
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
         android:layout_marginTop="10dp"
-        android:text="@string/select_calendars" />
+        android:text="@string/setup_select_calendars" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/login_email.xml b/res/layout/login_email.xml
index b51ff9fc..00c83e9f 100644
--- a/res/layout/login_email.xml
+++ b/res/layout/login_email.xml
@@ -18,8 +18,9 @@
             android:text="@string/login_email_description" />
         
         <TextView
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/login_email_address" />
+            android:labelFor="@+id/email_address"
+            android:text="@string/login_email_address"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
         <EditText
             android:id="@+id/email_address"
             android:layout_gravity="fill_horizontal"
@@ -28,9 +29,12 @@
             android:layout_width="0dp"
             android:scrollHorizontally="true"
             android:scrollbars="horizontal"
-            android:hint="myaccount@icloud.com" />
+            android:hint="myaccount@icloud.com">
+            <requestFocus />
+        </EditText>
 
         <TextView
+            android:labelFor="@+id/password"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/login_password" />
         <EditText
diff --git a/res/layout/login_type.xml b/res/layout/login_type.xml
index 03a9e52c..8ce0277e 100644
--- a/res/layout/login_type.xml
+++ b/res/layout/login_type.xml
@@ -16,8 +16,8 @@
             android:layout_height="wrap_content"
             android:checked="true"
             android:text="@string/login_type_email" />
-
         <TextView
+            android:labelFor="@+id/login_type_email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
@@ -28,8 +28,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/login_type_url" />
-
         <TextView
+            android:labelFor="@+id/login_type_url"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/login_type_url_description" />
diff --git a/res/layout/login_url.xml b/res/layout/login_url.xml
index b56da96d..110cb7c7 100644
--- a/res/layout/login_url.xml
+++ b/res/layout/login_url.xml
@@ -31,7 +31,9 @@
             android:layout_width="0dp"
             android:scrollHorizontally="true"
             android:scrollbars="horizontal"
-            android:hint="my.webhost.com" />
+            android:hint="my.webhost.com">
+            <requestFocus />
+        </EditText>
 
         <TextView
             android:id="@+id/http_warning"
@@ -77,7 +79,7 @@
             android:layout_columnSpan="2"
             android:checked="true"
             android:layout_gravity="left"
-            android:text="@string/auth_preemptive" />
+            android:text="@string/login_auth_preemptive" />
         
         <Space android:layout_gravity="left|top" />
         
diff --git a/res/layout/query_server.xml b/res/layout/query_server.xml
index d9ed32de..6a4ea530 100644
--- a/res/layout/query_server.xml
+++ b/res/layout/query_server.xml
@@ -16,6 +16,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:text="@string/querying_server" />
+        android:text="@string/setup_querying_server" />
 
 </LinearLayout>
diff --git a/res/layout/select_collections_header.xml b/res/layout/select_collections_header.xml
index e2695f9a..521dc124 100644
--- a/res/layout/select_collections_header.xml
+++ b/res/layout/select_collections_header.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:focusable="false"
         android:paddingBottom="10dp"
-        android:text="@string/what_to_sync"
+        android:text="@string/setup_what_to_sync"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
     </LinearLayout>
diff --git a/res/menu/account_details.xml b/res/menu/account_details.xml
index f1ddc560..e3bfc0b9 100644
--- a/res/menu/account_details.xml
+++ b/res/menu/account_details.xml
@@ -5,7 +5,7 @@
         android:id="@+id/add_account"
         android:icon="@drawable/navigation_accept"
         android:showAsAction="always|withText"
-        android:title="@string/add_account">
+        android:title="@string/setup_add_account">
     </item>
     
 </menu>
diff --git a/res/menu/debug_settings.xml b/res/menu/debug_settings.xml
index 79d4bc45..40f8ba75 100644
--- a/res/menu/debug_settings.xml
+++ b/res/menu/debug_settings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:title="@string/report_an_issue" android:showAsAction="always|withText" android:onClick="reportIssue" android:icon="@drawable/ic_action_new_event"></item>
+    <item android:title="@string/settings_report_an_issue" android:showAsAction="always|withText" android:onClick="reportIssue" android:icon="@drawable/ic_action_new_event"></item>
 </menu>
diff --git a/res/menu/main_activity.xml b/res/menu/main_activity.xml
index 2fa55dd1..132a9981 100644
--- a/res/menu/main_activity.xml
+++ b/res/menu/main_activity.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:onClick="addAccount" android:title="@string/add_account" android:showAsAction="always" android:icon="@drawable/ic_action_new_account"></item>
-    <item android:onClick="showSyncSettings" android:title="@string/show_sync_settings" android:showAsAction="always" android:icon="@drawable/show_sync_settings"></item>
-    <item android:onClick="showWebsite" android:title="@string/show_website" android:showAsAction="ifRoom" android:icon="@drawable/view_website"></item>
-    <item android:showAsAction="never" android:title="@string/debug_settings" android:onClick="showDebugSettings"></item>
+    <item android:onClick="addAccount" android:title="@string/setup_add_account" android:showAsAction="always" android:icon="@drawable/ic_action_new_account"></item>
+    <item android:onClick="showSyncSettings" android:title="@string/main_manage_accounts" android:showAsAction="always" android:icon="@drawable/show_sync_settings"></item>
+    <item android:onClick="showWebsite" android:title="@string/davdroid_website" android:showAsAction="ifRoom" android:icon="@drawable/view_website"></item>
+    <item android:showAsAction="never" android:title="@string/settings_debug" android:onClick="showDebugSettings"></item>
 </menu>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 46e779eb..1406ab4e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -16,24 +16,24 @@
     <string name="next">Següent</string>
     <string name="help">Ajuda</string>
     <string name="login_invalid_base_url">URL base invàlida: </string>
-    <string name="select_collections">DAVdroid: Seleccioneu col·leccions</string>
+    <string name="setup_select_collections">DAVdroid: Seleccioneu col·leccions</string>
     <string name="login_exception_io">Error de E/S: %s</string>
     <string name="exception_uri_syntax">URI invàlida: %s</string>
     <string name="exception_incapable_resource">Missing capabilities: %s</string>
-    <string name="neither_caldav_nor_carddav">Ni CalDAV ni CardDAV estan disponibles</string>
-    <string name="add_account">Afegir compte</string>
-    <string name="querying_server">Querying server. Please wait…</string>
+    <string name="setup_neither_caldav_nor_carddav">Ni CalDAV ni CardDAV estan disponibles</string>
+    <string name="setup_add_account">Afegir compte</string>
+    <string name="setup_querying_server">Querying server. Please wait…</string>
     <string name="exception_http">Error HTTP: %s</string>
-    <string name="what_to_sync">Which collections shall be synchronized?</string>
-    <string name="address_books">Llibretes de contactes</string>
-    <string name="calendars">Calendaris</string>
-    <string name="select_address_book">Seleccioneu com a molt una llibreta de contactes (Polseu de nou per deseleccionar):</string>
-    <string name="select_calendars">Seleccioneu els vostres calendaris:</string>
-    <string name="auth_preemptive">Autentificació preferent (recomanat, però incompatible amb l\'autentificació Digest)</string>
+    <string name="setup_what_to_sync">Which collections shall be synchronized?</string>
+    <string name="setup_address_books">Llibretes de contactes</string>
+    <string name="setup_calendars">Calendaris</string>
+    <string name="setup_select_address_book">Seleccioneu com a molt una llibreta de contactes (Polseu de nou per deseleccionar):</string>
+    <string name="setup_select_calendars">Seleccioneu els vostres calendaris:</string>
+    <string name="login_auth_preemptive">Autentificació preferent (recomanat, però incompatible amb l\'autentificació Digest)</string>
 
     <string name="davdroid_help">Ajuda DAVdroid</string>
-    <string name="show_sync_settings">Gestioneu les comptes sincronitzades</string>
-    <string name="show_website">Lloc web de DAVdroid</string>
+    <string name="main_manage_accounts">Gestioneu les comptes sincronitzades</string>
+    <string name="davdroid_website">Lloc web de DAVdroid</string>
     <string name="html_main_workaround"><![CDATA[
 		<p>Gràcies per comprar DAVDroid a travès de Google Play i així donar suport al projecte. De totes formes, hi ha dos incidències amb el Google Play:</p>
 
@@ -108,12 +108,12 @@
 	   	* <a href="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">MIT License</a>)</p>
     ]]></string>
 
-    <string name="account_details">Detalls del compte</string>
-    <string name="account_name">Nom del compte:</string>
-    <string name="account_name_hint">El meu compte CalDAV/CardDAV</string>
-    <string name="email_address">Correu electrònic:</string>
-    <string name="organizer_hint">"ORGANITZADOR dels teus events. Es requereix si feu servir la informació dels assitents"</string>
-    <string name="account_name_info">"Podeu fer servir la vostra addreça de correu electrònic com a nom de la compta ja que el Android utiltizar el nom de la compta com a camp ORGANITZADOR pels events que vosaltres creeu. No podeu tenir dos comptes amb el mateix nom.</string>
-    <string name="read_only">només-lectura</string>
+    <string name="setup_account_details">Detalls del compte</string>
+    <string name="setup_account_name">Nom del compte:</string>
+    <string name="setup_account_name_hint">El meu compte CalDAV/CardDAV</string>
+    <string name="setup_email_address">Correu electrònic:</string>
+    <string name="setup_organizer_hint">"ORGANITZADOR dels teus events. Es requereix si feu servir la informació dels assitents"</string>
+    <string name="setup_account_name_info">"Podeu fer servir la vostra addreça de correu electrònic com a nom de la compta ja que el Android utiltizar el nom de la compta com a camp ORGANITZADOR pels events que vosaltres creeu. No podeu tenir dos comptes amb el mateix nom.</string>
+    <string name="setup_read_only">només-lectura</string>
 
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 20b73036..fc3d672e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,24 +16,24 @@
     <string name="next">Další</string>
     <string name="help">Pomoc</string>
     <string name="login_invalid_base_url">Neplatná základní URL: </string>
-    <string name="select_collections">DAVdroid: Vybrat sbírky</string>
+    <string name="setup_select_collections">DAVdroid: Vybrat sbírky</string>
     <string name="login_exception_io">I/O chyba: %s</string>
     <string name="exception_uri_syntax">Neplatné URI: %s</string>
     <string name="exception_incapable_resource">Chybějící možnosti: %s</string>
-    <string name="neither_caldav_nor_carddav">V tomto umístění není CalDAV-/CardDAV služba dostupná.</string>
-    <string name="add_account">Přidat účet</string>
-    <string name="querying_server">Probíhá komunikace se servrem. Počkejte prosím…</string>
+    <string name="setup_neither_caldav_nor_carddav">V tomto umístění není CalDAV-/CardDAV služba dostupná.</string>
+    <string name="setup_add_account">Přidat účet</string>
+    <string name="setup_querying_server">Probíhá komunikace se servrem. Počkejte prosím…</string>
     <string name="exception_http">HTTP chyba: %s</string>
-    <string name="what_to_sync">Které sbírky mají být synchronizovány?</string>
-    <string name="address_books">Adresáře</string>
-    <string name="calendars">Kalendáře</string>
-    <string name="select_address_book">Vybrat alespoň jeden adresář (opakovaně tapnout pro odebrání):</string>
-    <string name="select_calendars">Vybrat své kalendáře:</string>
-    <string name="auth_preemptive">Preemptivní ověření (doporučeno, ale není kompatibilní s Digest ověřením)</string>
+    <string name="setup_what_to_sync">Které sbírky mají být synchronizovány?</string>
+    <string name="setup_address_books">Adresáře</string>
+    <string name="setup_calendars">Kalendáře</string>
+    <string name="setup_select_address_book">Vybrat alespoň jeden adresář (opakovaně tapnout pro odebrání):</string>
+    <string name="setup_select_calendars">Vybrat své kalendáře:</string>
+    <string name="login_auth_preemptive">Preemptivní ověření (doporučeno, ale není kompatibilní s Digest ověřením)</string>
     
     <string name="davdroid_help">Pomoc s DAVdroid</string>
-    <string name="show_sync_settings">Spravovat synchronizované účty</string>
-    <string name="show_website">Webová stránka DAVdroid</string>
+    <string name="main_manage_accounts">Spravovat synchronizované účty</string>
+    <string name="davdroid_website">Webová stránka DAVdroid</string>
     <string name="html_main_workaround"><![CDATA[
 		<p>Thank you for buying DAVdroid via Google Play and thus supporting the project. Unfortunately, there are two issues with Google Play:</p>
 		
@@ -108,22 +108,22 @@
 	   	* <a href="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
     ]]></string>
     
-    <string name="account_details">Detaily účtu</string>
-    <string name="account_name">Jméno účtu:</string>
-    <string name="account_name_hint">Můj CalDAV/CardDAV účet</string>
-    <string name="email_address">Emailová adresa:</string>
-    <string name="organizer_hint">"ORGANIZÁTOR událostí; vyžadováno pokud budete přidávat účastníky"</string>
-    <string name="account_name_info">"Použijte svou emailovou adresu jako jméno účtu, protože Android bude používat tuto hodnotu jako jméno ORGANIZÁTORA událostí které vytvoříte. Nemůžete mít dva účty se stejným jménem.</string>
-    <string name="read_only">pouze pro čtení</string>
+    <string name="setup_account_details">Detaily účtu</string>
+    <string name="setup_account_name">Jméno účtu:</string>
+    <string name="setup_account_name_hint">Můj CalDAV/CardDAV účet</string>
+    <string name="setup_email_address">Emailová adresa:</string>
+    <string name="setup_organizer_hint">"ORGANIZÁTOR událostí; vyžadováno pokud budete přidávat účastníky"</string>
+    <string name="setup_account_name_info">"Použijte svou emailovou adresu jako jméno účtu, protože Android bude používat tuto hodnotu jako jméno ORGANIZÁTORA událostí které vytvoříte. Nemůžete mít dva účty se stejným jménem.</string>
+    <string name="setup_read_only">pouze pro čtení</string>
     
-    <string name="general_settings">Obecná nastavení</string>
-    <string name="debug_settings">Ladící nastavení</string>
-    <string name="disable_http_compression">Vypnout HTTP kompresi</string>
-    <string name="http_compression_disabled">HTTP komprese je vypnuta (ladící mód)</string>
-    <string name="http_compression_enabled">HTTP komprese je použita všude kde možno</string>
-    <string name="network_logging">Logovat síťový provoz</string>
-    <string name="network_logging_enabled">Veškerý síťový provoz je detailně logován (ladící mód)</string>
-    <string name="network_logging_disabled">Síťový provoz není logován</string>
-    <string name="report_an_issue">Nahlásit problém</string>
+    <string name="settings_general">Obecná nastavení</string>
+    <string name="settings_debug">Ladící nastavení</string>
+    <string name="settings_disable_http_compression">Vypnout HTTP kompresi</string>
+    <string name="settings_http_compression_disabled">HTTP komprese je vypnuta (ladící mód)</string>
+    <string name="settings_http_compression_enabled">HTTP komprese je použita všude kde možno</string>
+    <string name="settings_network_logging">Logovat síťový provoz</string>
+    <string name="settings_network_logging_enabled">Veškerý síťový provoz je detailně logován (ladící mód)</string>
+    <string name="settings_network_logging_disabled">Síťový provoz není logován</string>
+    <string name="settings_report_an_issue">Nahlásit problém</string>
 
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 50774111..daf29d39 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,31 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="login_http_warning">Ohne Verschlüsselung (HTTPS) können Ihre Zugangsdaten, Kontakte und Termine leicht abgefangen werden.</string>
-    <string name="login_user_name">Benutzername:</string>
-    <string name="login_password">Passwort:</string>
-    <string name="login_base_url">Basis-URL (Ordner werden automatisch gefunden):</string>
+    <!-- common strings -->
+    <string name="davdroid_website">DAVdroid-Website</string>
     <string name="next">Weiter</string>
     <string name="help">Hilfe</string>
-    <string name="select_collections">DAVdroid: Ordner auswählen</string>
-    <string name="login_invalid_base_url">Ungültiger Basis-URL: </string>
-    <string name="login_exception_io">E/A-Fehler: %s</string>
-    <string name="exception_uri_syntax">Ungültiger URI: %s</string>
-    <string name="exception_incapable_resource">Fehlende Server-Unterstützung: %s</string>
-    <string name="neither_caldav_nor_carddav">An dieser Adresse konnte kein CalDAV- oder CardDAV-Dienst gefunden werden.</string>
-    <string name="add_account">Konto hinzufügen</string>
-    <string name="querying_server">Daten werden vom Server abgefragt. Bitte warten…</string>
-    <string name="exception_http">HTTP-Fehler: %s</string>
-    <string name="what_to_sync">Welche Ordner sollen synchronisiert werden?</string>
-    <string name="address_books">Adressbücher</string>
-    <string name="calendars">Kalender</string>
-    <string name="select_address_book">Ein oder kein Adressbuch auswählen (nochmal berühren, um abzuwählen):</string>
-    <string name="select_calendars">Kalender zur Synchronisation auswählen:</string>
-    <string name="auth_preemptive">Präemptive Authentifizierung (empfohlen, aber nicht kompatibel mit Digest-Auth.)</string>
     
-	<string name="davdroid_help">Hilfe zu DAVdroid</string>
-	<string name="show_sync_settings">Sync-Konten anzeigen</string>
-    <string name="show_website">DAVdroid-Website</string>
+    <string name="exception_http">HTTP-Fehler: %s</string>
+    <string name="exception_incapable_resource">Fehlende Server-Unterstützung: %s</string>
+    <string name="exception_io">E/A-Fehler: %s</string>
+    <string name="exception_uri_syntax">URI ungültig: %s</string>
+    
+    <!-- MainActivity -->    
+	<string name="main_manage_accounts">Sync-Konten anzeigen</string>
+    
     <string name="html_main_workaround"><![CDATA[
         <p>Vielen Dank, dass Sie DAVdroid im Play Store erworben haben und das Projekt dadurch unterstützen.       
         Leider gibt es derzeit zwei Probleme, die vom Play Store verursacht werden:</p>
@@ -79,19 +67,14 @@
 	   <a href="http://davdroid.bitfire.at/donate?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">für DAVdroid spenden</a> oder die App kaufen.</p>
 	   
 	   <h1>Lizenz</h1>
-	   <p>Copyright (c) 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>), alle Rechte
+	   <p>Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>), alle Rechte
 	   vorbehalten. Dieses Programm ist freie Software. Sie können es unter den Bedingungen der <a href="http://www.gnu.org/licenses/gpl.html">GNU
 	   General Public License Version 3</a>, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren.
 	   Sofern Google Play oder Samsung Store andere Bedingungen benötigen, gelten für über den jeweiligen Markt heruntergeladene
 	   Apps diese Bedingungen.</p>
 	   
-	   <p>Übersetzungen.
-	     Catalanian: <a href="https://github.com/pokoli">@pokoli</a>,
-	     Chinese (simplified): <a href="https://github.com/phy25">@phy25</a>,
-	     Czech: <a href="https://github.com/svetlemodry">Jaroslav Lichtblau</a>,
-	     Serbian: <a href="https://github.com/pejakm">@pejakm</a>,
-	     Spanish: <a href="https://github.com/xphnx">@xphnx</a>
-	   </p>
+	   <p>Die Übersetzung auf Deutsch wird von den Autoren zur Verfügung gestellt. Übersetzungen für andere Sprachen
+	   wurden von verschiedenen Leuten beigetragen, die in der jeweiligen Sprachversion erwähnt sind.</p>
 	   	   
 	   <h2>Verwendete Bibliotheken</h2>
 	   <p>
@@ -101,22 +84,52 @@
 	   	* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> – <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
 	   	* <a href="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
     ]]></string>
-    <string name="account_details">Konto-Details</string>
-    <string name="account_name">Kontoname:</string>
-    <string name="account_name_hint">Mein CalDAV/CardDAV-Konto</string>
-    <string name="email_address">Email-Adresse:</string>
-    <string name="organizer_hint">"ORGANIZER der von Ihnen angelegten Termine; notwendig für Teilnehmer-Info"</string>
-    <string name="account_name_info">&quot;Verwenden Sie Ihre Email-Adresse als Kontoname, da Android den Kontonamen als ORGANIZER-Feld in Terminen benutzt. Sie können keine zwei Konten mit dem gleichen Namen anlegen.</string>
-    <string name="read_only">schreibgeschützt</string>
+
+    <!-- AddAccountActivity -->
+    <string name="login_type_email">Mit Email-Adresse anmelden</string>
+    <string name="login_type_email_description">Domänenname wird verwendet, um die Servereinstellungen herauszufinden. Beispiel: myaccount@icloud.com</string>
+    <string name="login_type_url">Mit URL und Benutzername anmelden</string>
+    <string name="login_type_url_description">Basis-URL und Benutzername werden verwendet, um die Servereinstellungen herauszufinden; z.B. bei einem eigenen Server.</string>
     
-    <string name="general_settings">Allgemeine Einstellungen</string>
-    <string name="debug_settings">Einstellungen zur Fehlersuche</string>
-    <string name="disable_http_compression">HTTP-Komprimierung deaktivieren</string>
-    <string name="http_compression_disabled">HTTP-Komprimierung ist deaktiviert (zur Fehlersuche)</string>
-    <string name="http_compression_enabled">HTTP-Komprimierung wird verwendet, falls möglich</string>
-    <string name="network_logging">Netzwerkverkehr aufzeichnen</string>
-    <string name="network_logging_enabled">Der gesamte Netzwerkverkehr wird in den Android-Logs mitgeschrieben (zur Fehlersuche)</string>
-    <string name="network_logging_disabled">Netzwerkverkehr wird nicht aufgezeichnet</string>
-    <string name="report_an_issue">Problem berichten</string>
+    <string name="login_email_description">Geben Sie Ihre Email-Adresse ein. Der Domänenname wird verwendet, um die Servereinstellungen herauszufinden.</string>
+    <string name="login_email_address">Email:</string>
+    
+    <string name="login_http_warning">Ohne Verschlüsselung (HTTPS) können Ihre Zugangsdaten, Kontakte und Termine leicht abgefangen werden.</string>
+    <string name="login_user_name">Benutzername:</string>
+    <string name="login_base_url">Basis-URL (Ordner werden automatisch gefunden):</string>
+    <string name="login_auth_preemptive">Präemptive Authentifizierung (empfohlen, aber nicht kompatibel mit Digest-Auth.)</string>
+    
+    <string name="login_password">Passwort:</string>
+    
+    <string name="setup_select_collections">DAVdroid: Ordner auswählen</string>
+    <string name="setup_neither_caldav_nor_carddav">An dieser Adresse konnte kein CalDAV- oder CardDAV-Dienst gefunden werden.</string>
+    <string name="setup_add_account">Konto hinzufügen</string>
+    <string name="setup_querying_server">Daten werden vom Server abgefragt. Bitte warten…</string>
+    <string name="setup_what_to_sync">Welche Ordner sollen synchronisiert werden?</string>
+    <string name="setup_address_books">Adressbücher</string>
+    <string name="setup_calendars">Kalender</string>
+    <string name="setup_select_address_book">Ein oder kein Adressbuch auswählen (nochmal berühren, um abzuwählen):</string>
+    <string name="setup_select_calendars">Kalender zur Synchronisation auswählen:</string>
+
+    <string name="setup_account_details">Konto-Details</string>
+    <string name="setup_account_name">Kontoname:</string>
+    <string name="setup_account_name_hint">Mein CalDAV/CardDAV-Konto</string>
+    <string name="setup_email_address">Email-Adresse:</string>
+    <string name="setup_organizer_hint">"ORGANIZER der von Ihnen angelegten Termine; notwendig für Teilnehmer-Info"</string>
+    <string name="setup_account_name_info">&quot;Verwenden Sie Ihre Email-Adresse als Kontoname, da Android den Kontonamen als ORGANIZER-Feld in Terminen benutzt. Sie können keine zwei Konten mit dem gleichen Namen anlegen.</string>
+    <string name="setup_read_only">schreibgeschützt</string>
+    
+    <!-- account settings -->
+	<string name="davdroid_help">Hilfe zu DAVdroid</string>
+    
+    <string name="settings_general">Allgemeine Einstellungen</string>
+    <string name="settings_debug">Einstellungen zur Fehlersuche</string>
+    <string name="settings_disable_http_compression">HTTP-Komprimierung deaktivieren</string>
+    <string name="settings_http_compression_disabled">HTTP-Komprimierung ist deaktiviert (zur Fehlersuche)</string>
+    <string name="settings_http_compression_enabled">HTTP-Komprimierung wird verwendet, falls möglich</string>
+    <string name="settings_network_logging">Netzwerkverkehr aufzeichnen</string>
+    <string name="settings_network_logging_enabled">Der gesamte Netzwerkverkehr wird in den Android-Logs mitgeschrieben (zur Fehlersuche)</string>
+    <string name="settings_network_logging_disabled">Netzwerkverkehr wird nicht aufgezeichnet</string>
+    <string name="settings_report_an_issue">Problem berichten</string>
     
 </resources>
\ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1c1ca08b..da7c99c6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,24 +16,24 @@
     <string name="next">Siguiente</string>
     <string name="help">Ayuda</string>
     <string name="login_invalid_base_url">URL base no válida: </string>
-    <string name="select_collections">DAVdroid: Selecciona las colecciones</string>
+    <string name="setup_select_collections">DAVdroid: Selecciona las colecciones</string>
     <string name="login_exception_io">I/O error: %s</string>
     <string name="exception_uri_syntax">URI no válida: %s</string>
     <string name="exception_incapable_resource">Se han perdido capacidades: %s</string>
-    <string name="neither_caldav_nor_carddav">Ni CalDAV ni CardDAV están disponibles</string>
-    <string name="add_account">Añadir cuenta</string>
-    <string name="querying_server">Consultando el servidor. Espera, por favor…</string>
+    <string name="setup_neither_caldav_nor_carddav">Ni CalDAV ni CardDAV están disponibles</string>
+    <string name="setup_add_account">Añadir cuenta</string>
+    <string name="setup_querying_server">Consultando el servidor. Espera, por favor…</string>
     <string name="exception_http">error HTTP: %s</string>
-    <string name="what_to_sync">Qué colecciones quieres sincronizar?</string>
-    <string name="address_books">Agendas</string>
-    <string name="calendars">Calendarios</string>
-    <string name="select_address_book">Seleciona una agenda (pulsar de nuevo para desmarcar):</string>
-    <string name="select_calendars">Selecciona tus calendarios:</string>
-    <string name="auth_preemptive">Autentificación preferente (recomendado, pero incompatible con la autentificación de Digest)</string>
+    <string name="setup_what_to_sync">Qué colecciones quieres sincronizar?</string>
+    <string name="setup_address_books">Agendas</string>
+    <string name="setup_calendars">Calendarios</string>
+    <string name="setup_select_address_book">Seleciona una agenda (pulsar de nuevo para desmarcar):</string>
+    <string name="setup_select_calendars">Selecciona tus calendarios:</string>
+    <string name="login_auth_preemptive">Autentificación preferente (recomendado, pero incompatible con la autentificación de Digest)</string>
     
     <string name="davdroid_help">Ayuda de DAVdroid</string>
-    <string name="show_sync_settings">Administrar las cuentas sincronizadas</string>
-    <string name="show_website">Sitio web de DAVdroid</string>
+    <string name="main_manage_accounts">Administrar las cuentas sincronizadas</string>
+    <string name="davdroid_website">Sitio web de DAVdroid</string>
     <string name="html_main_info"><![CDATA[
        <h1>¡Bienvenido a DAVdroid/%s!</h1>
        
@@ -76,11 +76,11 @@
 	   	* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0">Licencia Apache Version 2.0</a>)<br/>
 	   	* <a href="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">Licencia MIT</a>)</p>
     ]]></string>
-    <string name="account_details">Detalles de la cuenta</string>
-    <string name="account_name">Nombre de la cuenta:</string>
-    <string name="account_name_hint">Mi cuenta CalDAV/CardDAV</string>
-    <string name="email_address">Dirección de correo:</string>
-    <string name="organizer_hint">"ORGANIZADOR de tus eventos; se necesita si se usa información de los asistentes"</string>
-    <string name="account_name_info">"Usa tu dirección de correo electrónico como nombre de cuenta porque Android usará el nombre de cuenta como campo de ORGANIZADOR para los eventos que crees. No puedes tener dos cuentas con el mismo nombre.</string>
+    <string name="setup_account_details">Detalles de la cuenta</string>
+    <string name="setup_account_name">Nombre de la cuenta:</string>
+    <string name="setup_account_name_hint">Mi cuenta CalDAV/CardDAV</string>
+    <string name="setup_email_address">Dirección de correo:</string>
+    <string name="setup_organizer_hint">"ORGANIZADOR de tus eventos; se necesita si se usa información de los asistentes"</string>
+    <string name="setup_account_name_info">"Usa tu dirección de correo electrónico como nombre de cuenta porque Android usará el nombre de cuenta como campo de ORGANIZADOR para los eventos que crees. No puedes tener dos cuentas con el mismo nombre.</string>
 
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e1ab1b83..c6a8aa2f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,24 +16,24 @@
     <string name="next">Suivant</string>
     <string name="help">Aide</string>
     <string name="login_invalid_base_url">Racine de l\'URL incorrecte:</string>
-    <string name="select_collections">DAVdroid: Sélectionnez les collections</string>
+    <string name="setup_select_collections">DAVdroid: Sélectionnez les collections</string>
     <string name="login_exception_io">Erreur I/O: %s</string>
     <string name="exception_uri_syntax">URI incorrecte: %s</string>
     <string name="exception_incapable_resource">Capacités manquantes: %s</string>
-    <string name="neither_caldav_nor_carddav">Aucun CalDAV ou CardDAV disponible</string>
-    <string name="add_account">Ajouter un compte</string>
-    <string name="querying_server">Interroge le serveur. Patientez svp.</string>
+    <string name="setup_neither_caldav_nor_carddav">Aucun CalDAV ou CardDAV disponible</string>
+    <string name="setup_add_account">Ajouter un compte</string>
+    <string name="setup_querying_server">Interroge le serveur. Patientez svp.</string>
     <string name="exception_http">Erreur HTTP: %s</string>
-    <string name="what_to_sync">Quelles collections doivent être synchronisées ?</string>
-    <string name="address_books">Carnets d\'adresses</string>
-    <string name="calendars">Agendas</string>
-    <string name="select_address_book">Choisissez un carnet d\'adresses(toucher à nouveau pour désélectionner):</string>
-    <string name="select_calendars">Choisissez vos agendas:</string>
-    <string name="auth_preemptive">Authentification préventive(recommandé, mais incompatible avec l\'authentification Digest)</string>
+    <string name="setup_what_to_sync">Quelles collections doivent être synchronisées ?</string>
+    <string name="setup_address_books">Carnets d\'adresses</string>
+    <string name="setup_calendars">Agendas</string>
+    <string name="setup_select_address_book">Choisissez un carnet d\'adresses(toucher à nouveau pour désélectionner):</string>
+    <string name="setup_select_calendars">Choisissez vos agendas:</string>
+    <string name="login_auth_preemptive">Authentification préventive(recommandé, mais incompatible avec l\'authentification Digest)</string>
     
     <string name="davdroid_help">Aide de DAVdroid</string>
-    <string name="show_sync_settings">Gérer les comptes synchronisés</string>
-    <string name="show_website">Site Web de DAVdroid</string>
+    <string name="main_manage_accounts">Gérer les comptes synchronisés</string>
+    <string name="davdroid_website">Site Web de DAVdroid</string>
     <string name="html_main_info"><![CDATA[
        <h1>Bienvenue dans DAVdroid/%s!</h1>
        
@@ -82,12 +82,12 @@
 	   	* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>)<br/>
 	   	* <a href="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">MIT License</a>)</p>
     ]]></string>
-    <string name="account_details">Détails du compte</string>
-    <string name="account_name">Nom du compte:</string>
-    <string name="account_name_hint">Mon compte CalDAV/CardDAV</string>
-    <string name="email_address">Adresse Email:</string>
-    <string name="organizer_hint">ORGANISATEUR de vos événements; nécessaire pour l\'information des participants</string>
-    <string name="account_name_info">Utilisez votre adresse email en tant que nom de compte car Android utilise ce nom pour le champ ORGANISATEUR des évènements que vous créez."
+    <string name="setup_account_details">Détails du compte</string>
+    <string name="setup_account_name">Nom du compte:</string>
+    <string name="setup_account_name_hint">Mon compte CalDAV/CardDAV</string>
+    <string name="setup_email_address">Adresse Email:</string>
+    <string name="setup_organizer_hint">ORGANISATEUR de vos événements; nécessaire pour l\'information des participants</string>
+    <string name="setup_account_name_info">Utilisez votre adresse email en tant que nom de compte car Android utilise ce nom pour le champ ORGANISATEUR des évènements que vous créez."
     Vous ne pouvez pas avoir deux comptes du même nom.</string>
 
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5f1f071d..07bfae83 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -16,24 +16,24 @@
     <string name="next">Tovább</string>
     <string name="help">Súgó</string>
     <string name="login_invalid_base_url">A fiók URL hibás: </string>
-    <string name="select_collections">DAVdroid: Gyűjtemény kiválasztása</string>
+    <string name="setup_select_collections">DAVdroid: Gyűjtemény kiválasztása</string>
     <string name="login_exception_io">I/O hiba: %s</string>
     <string name="exception_uri_syntax">Érvénytelen URI: %s</string>
     <string name="exception_incapable_resource">Hiányzó képesség: %s</string>
-    <string name="neither_caldav_nor_carddav">Nincs CalDAV-/CardDAV szolgáltatás a megadott helyen.</string>
-    <string name="add_account">Fiók hozzáadása</string>
-    <string name="querying_server">Kapcsolódás a szerverhez. Egy pillanat…</string>
+    <string name="setup_neither_caldav_nor_carddav">Nincs CalDAV-/CardDAV szolgáltatás a megadott helyen.</string>
+    <string name="setup_add_account">Fiók hozzáadása</string>
+    <string name="setup_querying_server">Kapcsolódás a szerverhez. Egy pillanat…</string>
     <string name="exception_http">HTTP hiba: %s</string>
-    <string name="what_to_sync">Melyik gyűjtemények legyenek szinkronizálva?</string>
-    <string name="address_books">Címjegyzékek</string>
-    <string name="select_address_book">Egy címjegyzék választható (a kijelölés megfordítása újbóli érintéssel):</string>
-    <string name="calendars">Naptárak</string>
-    <string name="select_calendars">Naptárak kiválasztása:</string>
-    <string name="auth_preemptive">Preemptív autentikáció (ajánlott, de Digest autentikációval nem működik)</string>
+    <string name="setup_what_to_sync">Melyik gyűjtemények legyenek szinkronizálva?</string>
+    <string name="setup_address_books">Címjegyzékek</string>
+    <string name="setup_select_address_book">Egy címjegyzék választható (a kijelölés megfordítása újbóli érintéssel):</string>
+    <string name="setup_calendars">Naptárak</string>
+    <string name="setup_select_calendars">Naptárak kiválasztása:</string>
+    <string name="login_auth_preemptive">Preemptív autentikáció (ajánlott, de Digest autentikációval nem működik)</string>
     
     <string name="davdroid_help">DAVdroid súgó</string>
-    <string name="show_sync_settings">Szinkronizációs fiókok kezelése</string>
-    <string name="show_website">DAVdroid web oldal</string>
+    <string name="main_manage_accounts">Szinkronizációs fiókok kezelése</string>
+    <string name="davdroid_website">DAVdroid web oldal</string>
     <string name="html_main_workaround"><![CDATA[
 		<p>Köszönjük, hogy megvásárolta a DAVdroid alkalmazást a Google Play áruházban, támogatva ezzel a projektet.  Sajnos, 
 		a Google Play áruházzal két probléma is van:</p>
@@ -97,22 +97,22 @@
 	   	* <a href="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
     ]]></string>
     
-    <string name="account_details">További beállítások</string>
-    <string name="account_name">A fiók neve:</string>
-    <string name="account_name_hint">CalDAV/CardDAV fiók</string>
-    <string name="email_address">Email cím:</string>
-    <string name="organizer_hint">"Szervező (ORGANIZER mező értéke), résztvevők kezelése esetén"</string>
-    <string name="account_name_info">"Használja az email címet fióknévként, mert később a létrehozandó események szervezőjeként (ORGANIZER mező) az Android ezt fogja használni. Két fiókot nem lehet azonos néven létrehozni.</string>
-    <string name="read_only">csak olvasható</string>
+    <string name="setup_account_details">További beállítások</string>
+    <string name="setup_account_name">A fiók neve:</string>
+    <string name="setup_account_name_hint">CalDAV/CardDAV fiók</string>
+    <string name="setup_email_address">Email cím:</string>
+    <string name="setup_organizer_hint">"Szervező (ORGANIZER mező értéke), résztvevők kezelése esetén"</string>
+    <string name="setup_account_name_info">"Használja az email címet fióknévként, mert később a létrehozandó események szervezőjeként (ORGANIZER mező) az Android ezt fogja használni. Két fiókot nem lehet azonos néven létrehozni.</string>
+    <string name="setup_read_only">csak olvasható</string>
     
-    <string name="general_settings">Általános beállítások</string>
-    <string name="debug_settings">Hibakeresési beállítások</string>
-    <string name="disable_http_compression">HTTP tömörítés kikapcsolása</string>
-    <string name="http_compression_disabled">HTTP tömörítés kikapcsolva (hibakeresés)</string>
-    <string name="http_compression_enabled">HTTP tömörítés bekapcsolva (ahol csak lehetséges)</string>
-    <string name="network_logging">Hálózati forgalom naplózása</string>
-    <string name="network_logging_enabled">A teljes hálózati forgalom részletes naplózása (hibakeresés)</string>
-    <string name="network_logging_disabled">A hálózati forgalom naplózása kikapcsolva</string>
-    <string name="report_an_issue">Probléma bejelentése</string>
+    <string name="settings_general">Általános beállítások</string>
+    <string name="settings_debug">Hibakeresési beállítások</string>
+    <string name="settings_disable_http_compression">HTTP tömörítés kikapcsolása</string>
+    <string name="settings_http_compression_disabled">HTTP tömörítés kikapcsolva (hibakeresés)</string>
+    <string name="settings_http_compression_enabled">HTTP tömörítés bekapcsolva (ahol csak lehetséges)</string>
+    <string name="settings_network_logging">Hálózati forgalom naplózása</string>
+    <string name="settings_network_logging_enabled">A teljes hálózati forgalom részletes naplózása (hibakeresés)</string>
+    <string name="settings_network_logging_disabled">A hálózati forgalom naplózása kikapcsolva</string>
+    <string name="settings_report_an_issue">Probléma bejelentése</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b4383ddd..e56184bb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -16,24 +16,24 @@
     <string name="next">Следеће</string>
     <string name="help">Помоћ</string>
     <string name="login_invalid_base_url">Неисправан основни УРИ: </string>
-    <string name="select_collections">ДАВдроид: Изаберите збирке</string>
+    <string name="setup_select_collections">ДАВдроид: Изаберите збирке</string>
     <string name="login_exception_io">И/О грешка: %s</string>
     <string name="exception_uri_syntax">Неисправан УРИ: %s</string>
     <string name="exception_incapable_resource">Недостају могућности: %s</string>
-    <string name="neither_caldav_nor_carddav">Нема доступног КалДАВ/КардДАВ сервиса на овој локацији.</string>
-    <string name="add_account">Додај налог</string>
-    <string name="querying_server">Шаљем упит серверу. Сачекајте…</string>
+    <string name="setup_neither_caldav_nor_carddav">Нема доступног КалДАВ/КардДАВ сервиса на овој локацији.</string>
+    <string name="setup_add_account">Додај налог</string>
+    <string name="setup_querying_server">Шаљем упит серверу. Сачекајте…</string>
     <string name="exception_http">ХТТП грешка: %s</string>
-    <string name="what_to_sync">Које збирке да синхронизујем?</string>
-    <string name="address_books">Адресари</string>
-    <string name="calendars">Календари</string>
-    <string name="select_address_book">Изаберите један адресар (додирните поново да поништите избор):</string>
-    <string name="select_calendars">Изаберите ваше календаре:</string>
-    <string name="auth_preemptive">Превентивна аутентификација (препоручено, али није компатибилно са Дигест аутентификацијом)</string>
+    <string name="setup_what_to_sync">Које збирке да синхронизујем?</string>
+    <string name="setup_address_books">Адресари</string>
+    <string name="setup_calendars">Календари</string>
+    <string name="setup_select_address_book">Изаберите један адресар (додирните поново да поништите избор):</string>
+    <string name="setup_select_calendars">Изаберите ваше календаре:</string>
+    <string name="login_auth_preemptive">Превентивна аутентификација (препоручено, али није компатибилно са Дигест аутентификацијом)</string>
     
     <string name="davdroid_help">ДАВдроид помоћ</string>
-    <string name="show_sync_settings">Управљај налозима синхронизације</string>
-    <string name="show_website">ДАВдроид вебсајт</string>
+    <string name="main_manage_accounts">Управљај налозима синхронизације</string>
+    <string name="davdroid_website">ДАВдроид вебсајт</string>
     <string name="html_main_workaround"><![CDATA[
 		<p>Хвала вам што сте купили ДАВдроид преко Google Play сервиса и тиме подржали овај пројекат. Нажалост, постоје два проблема са Google Play сервисом:</p>
 		
@@ -104,22 +104,22 @@
 	   	* <a href="http://projectlombok.org/">Пројекат Ломбок</a> – <a href="http://opensource.org/licenses/mit-license.php">МИТ лиценца</a></p>
     ]]></string>
     
-    <string name="account_details">Детаљи налога</string>
-    <string name="account_name">Име налога:</string>
-    <string name="account_name_hint">Мој КалДАВ/КардДАВ налог</string>
-    <string name="email_address">Е-адреса:</string>
-    <string name="organizer_hint">"ОРГАНИЗАТОР ваших догађаја; потребно ако користите податке о учеснику"</string>
-    <string name="account_name_info">"Користите вашу е-адресу као име налога јер Андроид користи име налога за поље ОРГАНИЗАТОР за догађаје које направите. Не можете имати два налога истог имена.</string>
-    <string name="read_only">само-за-читање</string>
+    <string name="setup_account_details">Детаљи налога</string>
+    <string name="setup_account_name">Име налога:</string>
+    <string name="setup_account_name_hint">Мој КалДАВ/КардДАВ налог</string>
+    <string name="setup_email_address">Е-адреса:</string>
+    <string name="setup_organizer_hint">"ОРГАНИЗАТОР ваших догађаја; потребно ако користите податке о учеснику"</string>
+    <string name="setup_account_name_info">"Користите вашу е-адресу као име налога јер Андроид користи име налога за поље ОРГАНИЗАТОР за догађаје које направите. Не можете имати два налога истог имена.</string>
+    <string name="setup_read_only">само-за-читање</string>
     
-    <string name="general_settings">Опште поставке</string>
-    <string name="debug_settings">Поставке проналаска грешака</string>
-    <string name="disable_http_compression">Искључи ХТТП компресију</string>
-    <string name="http_compression_disabled">ХТТП компресија је искључена (режим проналаска грешака)</string>
-    <string name="http_compression_enabled">ХТТП компресија се користи кад год је могуће</string>
-    <string name="network_logging">Бележи мрежни саобраћај</string>
-    <string name="network_logging_enabled">Сав мрежни саобраћај се исцрпно бележи у дневник (режим проналаска грешака)</string>
-    <string name="network_logging_disabled">Мрежни саобраћај се не бележи у дневник</string>
-    <string name="report_an_issue">Пријави грешку</string>
+    <string name="settings_general">Опште поставке</string>
+    <string name="settings_debug">Поставке проналаска грешака</string>
+    <string name="settings_disable_http_compression">Искључи ХТТП компресију</string>
+    <string name="settings_http_compression_disabled">ХТТП компресија је искључена (режим проналаска грешака)</string>
+    <string name="settings_http_compression_enabled">ХТТП компресија се користи кад год је могуће</string>
+    <string name="settings_network_logging">Бележи мрежни саобраћај</string>
+    <string name="settings_network_logging_enabled">Сав мрежни саобраћај се исцрпно бележи у дневник (режим проналаска грешака)</string>
+    <string name="settings_network_logging_disabled">Мрежни саобраћај се не бележи у дневник</string>
+    <string name="settings_report_an_issue">Пријави грешку</string>
 
 </resources>
diff --git a/res/values-zh-rcn/strings.xml b/res/values-zh-rcn/strings.xml
index f6fe6ad6..f02169e6 100644
--- a/res/values-zh-rcn/strings.xml
+++ b/res/values-zh-rcn/strings.xml
@@ -16,24 +16,24 @@
     <string name="next">继续</string>
     <string name="help">帮助</string>
     <string name="login_invalid_base_url">基准地址无效: </string>
-    <string name="select_collections">DAVdroid: 选择同步项</string>
+    <string name="setup_select_collections">DAVdroid: 选择同步项</string>
     <string name="login_exception_io">I/O error: %s</string>
     <string name="exception_uri_syntax">URI 无效: %s</string>
     <string name="exception_incapable_resource">服务器缺少功能: %s</string>
-    <string name="neither_caldav_nor_carddav">此服务器地址上没有可用的 CalDAV-/CardDAV 服务。</string>
-    <string name="add_account">增加账户</string>
-    <string name="querying_server">正在请求，请稍等…</string>
+    <string name="setup_neither_caldav_nor_carddav">此服务器地址上没有可用的 CalDAV-/CardDAV 服务。</string>
+    <string name="setup_add_account">增加账户</string>
+    <string name="setup_querying_server">正在请求，请稍等…</string>
     <string name="exception_http">HTTP 错误: %s</string>
-    <string name="what_to_sync">需要同步哪些集合？</string>
-    <string name="address_books">通讯录</string>
-    <string name="calendars">日历</string>
-    <string name="select_address_book">最多可选择一个通讯录：（再次点按可取消选择）</string>
-    <string name="select_calendars">选择日历：</string>
-    <string name="auth_preemptive">使用抢先认证模式（推荐使用，但不兼容 Digest 认证方式）</string>
+    <string name="setup_what_to_sync">需要同步哪些集合？</string>
+    <string name="setup_address_books">通讯录</string>
+    <string name="setup_calendars">日历</string>
+    <string name="setup_select_address_book">最多可选择一个通讯录：（再次点按可取消选择）</string>
+    <string name="setup_select_calendars">选择日历：</string>
+    <string name="login_auth_preemptive">使用抢先认证模式（推荐使用，但不兼容 Digest 认证方式）</string>
     
     <string name="davdroid_help">DAVdroid 帮助</string>
-    <string name="show_sync_settings">管理同步账户</string>
-    <string name="show_website">DAVdroid 网站</string>
+    <string name="main_manage_accounts">管理同步账户</string>
+    <string name="davdroid_website">DAVdroid 网站</string>
     <string name="html_main_workaround"><![CDATA[
 		<p>感谢您在 Google Play 上购买 DAVdroid 支持本项目。然而 Google Play 版应用有两个问题：</p>
 		
@@ -94,22 +94,22 @@
 	   	* <a href="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
     ]]></string>
     
-    <string name="account_details">账户信息</string>
-    <string name="account_name">帐户名：</string>
-    <string name="account_name_hint">我的 CalDAV/CardDAV 账户</string>
-    <string name="email_address">Email 地址：</string>
-    <string name="organizer_hint">"日程的组织者 (ORGANIZER)；如果您使用参与者信息，则必填"</string>
-    <string name="account_name_info">"请使用您的 E-mail 地址作为账户名，因为 Android 会将帐户名用于您创建的日程的参与者 (ORGANIZER) 项。您不能有两个重名的账户。</string>
-    <string name="read_only">只读</string>
+    <string name="setup_account_details">账户信息</string>
+    <string name="setup_account_name">帐户名：</string>
+    <string name="setup_account_name_hint">我的 CalDAV/CardDAV 账户</string>
+    <string name="setup_email_address">Email 地址：</string>
+    <string name="setup_organizer_hint">"日程的组织者 (ORGANIZER)；如果您使用参与者信息，则必填"</string>
+    <string name="setup_account_name_info">"请使用您的 E-mail 地址作为账户名，因为 Android 会将帐户名用于您创建的日程的参与者 (ORGANIZER) 项。您不能有两个重名的账户。</string>
+    <string name="setup_read_only">只读</string>
     
-    <string name="general_settings">普通设置</string>
-    <string name="debug_settings">调试设置</string>
-    <string name="disable_http_compression">停用 HTTP 压缩</string>
-    <string name="http_compression_disabled">HTTP 压缩已停用（调试模式）</string>
-    <string name="http_compression_enabled">HTTP 压缩会在可用时使用</string>
-    <string name="network_logging">记录网络传输</string>
-    <string name="network_logging_enabled">所有网络传输内容会被日志记录（调试模式）</string>
-    <string name="network_logging_disabled">网络传输不会被日志记录</string>
-    <string name="report_an_issue">报告问题</string>
+    <string name="settings_general">普通设置</string>
+    <string name="settings_debug">调试设置</string>
+    <string name="settings_disable_http_compression">停用 HTTP 压缩</string>
+    <string name="settings_http_compression_disabled">HTTP 压缩已停用（调试模式）</string>
+    <string name="settings_http_compression_enabled">HTTP 压缩会在可用时使用</string>
+    <string name="settings_network_logging">记录网络传输</string>
+    <string name="settings_network_logging_enabled">所有网络传输内容会被日志记录（调试模式）</string>
+    <string name="settings_network_logging_disabled">网络传输不会被日志记录</string>
+    <string name="settings_report_an_issue">报告问题</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 29881905..0b7842e3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,6 +4,7 @@
     <!-- common strings -->
     <string name="app_name">DAVdroid</string>
     
+    <string name="davdroid_website">DAVdroid Web site</string>
     <string name="next">Next</string>
     <string name="help">Help</string>
     
@@ -13,6 +14,8 @@
     <string name="exception_uri_syntax">Invalid URI: %s</string>
     
     <!-- MainActivity -->
+    <string name="main_manage_accounts">Manage sync accounts</string>
+    
     <string name="html_main_workaround"><![CDATA[
 		<p>Thank you for buying DAVdroid via Google Play and thus supporting the project. Unfortunately, there are two issues with Google Play:</p>
 		
@@ -63,20 +66,15 @@
 	   or purchasing it.</p>
 	   
 	   <h1>License</h1>
-	   <p>Copyright (c) 2013 – 2014 Ricki Hirner (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
+	   <p>Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (<a href="http://www.bitfire.at">bitfire web engineering</a>). All rights reserved.
 	   This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 which
 	   accompanies this distribution, and is available at <a
 	   href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a>. As far as Google Play, Samsung
 	   Store, AndroidPit App Center or Amazon Appstore require other terms, the respective terms apply for versions
 	   that are downloaded via these services.</p>
 	   
-	   <p>Translations.
-	     Catalanian: <a href="https://github.com/pokoli">@pokoli</a>,
-	     Chinese (simplified): <a href="https://github.com/phy25">@phy25</a>,
-	     Czech: <a href="https://github.com/svetlemodry">Jaroslav Lichtblau</a>,
-	     Serbian: <a href="https://github.com/pejakm">@pejakm</a>,
-	     Spanish: <a href="https://github.com/xphnx">@xphnx</a>
-	   </p>
+	   <p>Translation for German is provided by the authors. Translations to other languages have been contributed by
+	   various people which are mentioned in their respective language version.</p>
 	   
 	   <h2>Used third-party libraries</h2>
 	   <p>
@@ -93,8 +91,6 @@
     <string name="login_type_url">Login with URL and user name</string>
     <string name="login_type_url_description">Service details will be auto-detected by initial URL and user name. Mostly used for self-hosted services.</string>
     
-    <string name="login_password">Password:</string>
-    
     <string name="login_email_description">Please enter your email address. Its domain name will be used to auto-detect service settings.</string>
     <string name="login_email_address">Email:</string>
     
@@ -105,40 +101,37 @@
     <string name="login_http_warning">"If you don't use encryption (HTTPS), other people may easily intercept your login details, contacts and events."</string>
     <string name="login_user_name">User name:</string>
     <string name="login_base_url">Base URL (collections will be auto-detected):</string>
-    <string name="login_invalid_base_url">Invalid base URL: </string>
+    <string name="login_auth_preemptive">Preemptive authentication (recommended, but incompatible with Digest auth)</string>
+
+    <string name="login_password">Password:</string>
     
-    <string name="select_collections">DAVdroid: Select collections</string>
-    <string name="neither_caldav_nor_carddav">No CalDAV-/CardDAV service is available at this location.</string>
-    <string name="add_account">Add account</string>
-    <string name="querying_server">Querying server. Please wait…</string>
-    <string name="what_to_sync">Which collections shall be synchronized?</string>
-    <string name="address_books">Address books</string>
-    <string name="calendars">Calendars</string>
-    <string name="select_address_book">Select up to one address book (tap again to unselect):</string>
-    <string name="select_calendars">Select your calendars:</string>
-    <string name="auth_preemptive">Preemptive authentication (recommended, but incompatible with Digest auth)</string>
+    <string name="setup_select_collections">DAVdroid: Select collections</string>
+    <string name="setup_neither_caldav_nor_carddav">No CalDAV-/CardDAV service is available at this location.</string>
+    <string name="setup_add_account">Add account</string>
+    <string name="setup_querying_server">Querying server. Please wait…</string>
+    <string name="setup_what_to_sync">Which collections shall be synchronized?</string>
+    <string name="setup_address_books">Address books</string>
+    <string name="setup_calendars">Calendars</string>
+    <string name="setup_select_address_book">Select up to one address book (tap again to unselect):</string>
+    <string name="setup_select_calendars">Select your calendars:</string>
     
-    <string name="davdroid_help">DAVdroid Help</string>
-    <string name="show_sync_settings">Manage sync accounts</string>
-    <string name="show_website">DAVdroid Web site</string>
-    
-    <string name="account_details">Account details</string>
-    <string name="account_name">Account name:</string>
-    <string name="account_name_hint">My CalDAV/CardDAV Account</string>
-    <string name="email_address">Email address:</string>
-    <string name="organizer_hint">"ORGANIZER of your events; required if you use attendee info"</string>
-    <string name="account_name_info">"Use your email address as account name because Android will use the account name as ORGANIZER field for events you create. You can't have two accounts with the same name.</string>
-    <string name="read_only">read-only</string>
-    
-    <string name="menu_settings">Settings</string>
-    <string name="general_settings">General settings</string>
-    <string name="debug_settings">Debug settings</string>
-    <string name="disable_http_compression">Disable HTTP compression</string>
-    <string name="http_compression_disabled">HTTP compression is disabled (debug mode)</string>
-    <string name="http_compression_enabled">HTTP compression is used whenever possible</string>
-    <string name="network_logging">Log network traffic</string>
-    <string name="network_logging_enabled">All network traffic is being logged verbosely (debug mode)</string>
-    <string name="network_logging_disabled">Network traffic is not being logged</string>
-    <string name="report_an_issue">Report an issue</string>
+    <string name="setup_account_details">Account details</string>
+    <string name="setup_account_name">Account name:</string>
+    <string name="setup_account_name_hint">My CalDAV/CardDAV Account</string>
+    <string name="setup_email_address">Email address:</string>
+    <string name="setup_organizer_hint">"ORGANIZER of your events; required if you use attendee info"</string>
+    <string name="setup_account_name_info">"Use your email address as account name because Android will use the account name as ORGANIZER field for events you create. You can't have two accounts with the same name.</string>
+    <string name="setup_read_only">read-only</string>
+
+    <!-- account settings -->
+    <string name="settings_general">General settings</string>
+    <string name="settings_debug">Debug settings</string>
+    <string name="settings_disable_http_compression">Disable HTTP compression</string>
+    <string name="settings_http_compression_disabled">HTTP compression is disabled (debug mode)</string>
+    <string name="settings_http_compression_enabled">HTTP compression is used whenever possible</string>
+    <string name="settings_network_logging">Log network traffic</string>
+    <string name="settings_network_logging_enabled">All network traffic is being logged verbosely (debug mode)</string>
+    <string name="settings_network_logging_disabled">Network traffic is not being logged</string>
+    <string name="settings_report_an_issue">Report an issue</string>
     
 </resources>
diff --git a/res/xml/account_prefs.xml b/res/xml/account_prefs.xml
index 33295623..101de536 100644
--- a/res/xml/account_prefs.xml
+++ b/res/xml/account_prefs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     
-    <PreferenceScreen android:title="@string/davdroid_help" >
+    <PreferenceScreen android:title="@string/davdroid_website" >
         <intent
             android:targetPackage="at.bitfire.davdroid"
             android:targetClass="at.bitfire.davdroid.MainActivity"
@@ -9,9 +9,9 @@
     </PreferenceScreen>
 
     
-    <PreferenceCategory android:title="@string/general_settings" />
+    <PreferenceCategory android:title="@string/settings_general" />
     
-    <PreferenceScreen android:title="@string/debug_settings">
+    <PreferenceScreen android:title="@string/settings_debug">
         <intent
             android:targetPackage="at.bitfire.davdroid"
             android:targetClass="at.bitfire.davdroid.syncadapter.GeneralSettingsActivity"
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 23af9e41..be95c323 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -3,9 +3,9 @@
 
     <CheckBoxPreference
         android:key="disable_compression"
-        android:summaryOff="@string/http_compression_enabled"
-        android:summaryOn="@string/http_compression_disabled"
-        android:title="@string/disable_http_compression" />
-    <CheckBoxPreference android:title="@string/network_logging" android:summaryOn="@string/network_logging_enabled" android:key="network_logging" android:summaryOff="@string/network_logging_disabled"/>
+        android:summaryOff="@string/settings_http_compression_enabled"
+        android:summaryOn="@string/settings_http_compression_disabled"
+        android:title="@string/settings_disable_http_compression" />
+    <CheckBoxPreference android:title="@string/settings_network_logging" android:summaryOn="@string/settings_network_logging_enabled" android:key="network_logging" android:summaryOff="@string/settings_network_logging_disabled"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/at/bitfire/davdroid/Constants.java b/src/at/bitfire/davdroid/Constants.java
index 2411bc40..9349e433 100644
--- a/src/at/bitfire/davdroid/Constants.java
+++ b/src/at/bitfire/davdroid/Constants.java
@@ -9,7 +9,7 @@ package at.bitfire.davdroid;
 
 public class Constants {
 	public static final String
-		APP_VERSION = "0.6.6",
+		APP_VERSION = "0.6.7",
 		ACCOUNT_TYPE = "bitfire.at.davdroid",
 		WEB_URL_HELP = "http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",
 		
diff --git a/src/at/bitfire/davdroid/resource/DavResourceFinder.java b/src/at/bitfire/davdroid/resource/DavResourceFinder.java
index 5fcb9e9f..cd7163ce 100644
--- a/src/at/bitfire/davdroid/resource/DavResourceFinder.java
+++ b/src/at/bitfire/davdroid/resource/DavResourceFinder.java
@@ -137,7 +137,7 @@ public class DavResourceFinder implements Closeable {
 		}
 						
 		if (!serverInfo.isCalDAV() && !serverInfo.isCardDAV())
-			throw new DavIncapableException(context.getString(R.string.neither_caldav_nor_carddav));
+			throw new DavIncapableException(context.getString(R.string.setup_neither_caldav_nor_carddav));
 
 	}
 	
@@ -149,7 +149,6 @@ public class DavResourceFinder implements Closeable {
 	 * @return				Initial service URL (HTTP/HTTPS), without user credentials
 	 * @throws URISyntaxException when the user-given URI is invalid
 	 * @throws MalformedURLException when the user-given URI is invalid
-	 * @throws UnknownServiceURLException when no intial service URL could be determined
 	 */
 	public URL getInitialContextURL(ServerInfo serverInfo, String serviceName) throws URISyntaxException, MalformedURLException {
 		String	scheme = null,
@@ -165,8 +164,12 @@ public class DavResourceFinder implements Closeable {
 			// determine service FQDN
 			int pos = mailbox.lastIndexOf("@");
 			if (pos == -1)
-				throw new URISyntaxException(mailbox, "Email address doesn't contain @");
+				throw new URISyntaxException(mailbox, "Missing @ sign");
+			
+			scheme = "https";
 			domain = mailbox.substring(pos + 1);
+			if (domain.isEmpty())
+				throw new URISyntaxException(mailbox, "Missing domain name");
 		} else {
 			// HTTP(S) URLs
 			scheme = baseURI.getScheme();
@@ -221,44 +224,45 @@ public class DavResourceFinder implements Closeable {
 	 */
 	WebDavResource getCurrentUserPrincipal(ServerInfo serverInfo, String serviceName) throws URISyntaxException, IOException, NotAuthorizedException {
 		URL initialURL = getInitialContextURL(serverInfo, serviceName);
-		
-		// determine base URL (host name and initial context path)
-		WebDavResource base = new WebDavResource(httpClient,
-				//new URI(URIUtils.ensureTrailingSlash(serverInfo.getBaseURI())),
-				initialURL,
-				serverInfo.getUserName(), serverInfo.getPassword(), serverInfo.isAuthPreemptive());
-		
-		// look for well-known service (RFC 5785)
-		try {
-			WebDavResource wellKnown = new WebDavResource(base, "/.well-known/" + serviceName);
-			wellKnown.propfind(Mode.CURRENT_USER_PRINCIPAL);
-			if (wellKnown.getCurrentUserPrincipal() != null)
-				return new WebDavResource(wellKnown, wellKnown.getCurrentUserPrincipal());
-		} catch (NotAuthorizedException e) {
-			Log.w(TAG, "Not authorized for well-known " + serviceName + " service detection", e);
-			throw e;
-		} catch (URISyntaxException e) {
-			Log.w(TAG, "Well-known" + serviceName + " service detection failed because of invalid URIs", e);
-		} catch (HttpException e) {
-			Log.d(TAG, "Well-known " + serviceName + " service detection failed with HTTP error", e);
-		} catch (DavException e) {
-			Log.w(TAG, "Well-known " + serviceName + " service detection failed with unexpected DAV response", e);
+		if (initialURL != null) {
+			// determine base URL (host name and initial context path)
+			WebDavResource base = new WebDavResource(httpClient,
+					//new URI(URIUtils.ensureTrailingSlash(serverInfo.getBaseURI())),
+					initialURL,
+					serverInfo.getUserName(), serverInfo.getPassword(), serverInfo.isAuthPreemptive());
+			
+			// look for well-known service (RFC 5785)
+			try {
+				WebDavResource wellKnown = new WebDavResource(base, "/.well-known/" + serviceName);
+				wellKnown.propfind(Mode.CURRENT_USER_PRINCIPAL);
+				if (wellKnown.getCurrentUserPrincipal() != null)
+					return new WebDavResource(wellKnown, wellKnown.getCurrentUserPrincipal());
+			} catch (NotAuthorizedException e) {
+				Log.w(TAG, "Not authorized for well-known " + serviceName + " service detection", e);
+				throw e;
+			} catch (URISyntaxException e) {
+				Log.w(TAG, "Well-known" + serviceName + " service detection failed because of invalid URIs", e);
+			} catch (HttpException e) {
+				Log.d(TAG, "Well-known " + serviceName + " service detection failed with HTTP error", e);
+			} catch (DavException e) {
+				Log.w(TAG, "Well-known " + serviceName + " service detection failed with unexpected DAV response", e);
+			}
+	
+			// fall back to user-given initial context path
+			try {
+				base.propfind(Mode.CURRENT_USER_PRINCIPAL);
+				if (base.getCurrentUserPrincipal() != null)
+					return new WebDavResource(base, base.getCurrentUserPrincipal());
+			} catch (NotAuthorizedException e) {
+				Log.e(TAG, "Not authorized for querying principal", e);
+				throw e;
+			} catch (HttpException e) {
+				Log.e(TAG, "HTTP error when querying principal", e);
+			} catch (DavException e) {
+				Log.e(TAG, "DAV error when querying principal", e);
+			}
+			Log.i(TAG, "Couldn't find current-user-principal for service " + serviceName);
 		}
-
-		// fall back to user-given initial context path
-		try {
-			base.propfind(Mode.CURRENT_USER_PRINCIPAL);
-			if (base.getCurrentUserPrincipal() != null)
-				return new WebDavResource(base, base.getCurrentUserPrincipal());
-		} catch (NotAuthorizedException e) {
-			Log.e(TAG, "Not authorized for querying principal", e);
-			throw e;
-		} catch (HttpException e) {
-			Log.e(TAG, "HTTP error when querying principal", e);
-		} catch (DavException e) {
-			Log.e(TAG, "DAV error when querying principal", e);
-		}
-		Log.i(TAG, "Couldn't find current-user-principal for service " + serviceName);
 		return null;
 	}
 	
diff --git a/src/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java b/src/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java
index 2bf70b6b..72fb1d8b 100644
--- a/src/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java
+++ b/src/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java
@@ -77,7 +77,8 @@ public class LoginEmailFragment extends Fragment implements TextWatcher {
 			URI uri = new URI("mailto:" + email);
 			if (uri.isOpaque()) {
 				int pos = email.lastIndexOf("@");
-				emailOk = pos != -1;
+				if (pos != -1)
+					emailOk = !email.substring(pos+1).isEmpty();
 			}
 		} catch (URISyntaxException e) {
 			// invalid mailto: URI
diff --git a/src/at/bitfire/davdroid/syncadapter/SelectCollectionsAdapter.java b/src/at/bitfire/davdroid/syncadapter/SelectCollectionsAdapter.java
index 121ea308..f2945a50 100644
--- a/src/at/bitfire/davdroid/syncadapter/SelectCollectionsAdapter.java
+++ b/src/at/bitfire/davdroid/syncadapter/SelectCollectionsAdapter.java
@@ -128,7 +128,7 @@ public class SelectCollectionsAdapter extends BaseAdapter implements ListAdapter
 		// set text		
 		String title = "<b>" + info.getTitle() + "</b>";
 		if (info.isReadOnly())
-			title = title + " (" + context.getString(R.string.read_only) + ")";
+			title = title + " (" + context.getString(R.string.setup_read_only) + ")";
 		
 		String description = info.getDescription();
 		if (description == null)