diff --git a/app/build.gradle b/app/build.gradle
index f160c0c1..fa794659 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
 
-        versionCode 97
-        versionName "1.0.7-beta1"
+        versionCode 98
+        versionName "1.0.7"
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
     }
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/HttpClientTest.java b/app/src/androidTest/java/at/bitfire/davdroid/HttpClientTest.java
index afe93560..bb75c48c 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/HttpClientTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/HttpClientTest.java
@@ -8,7 +8,7 @@
 
 package at.bitfire.davdroid;
 
-import android.test.InstrumentationTestCase;
+import junit.framework.TestCase;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -19,7 +19,7 @@ import okhttp3.Request;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 
-public class HttpClientTest extends InstrumentationTestCase {
+public class HttpClientTest extends TestCase {
 
     MockWebServer server;
     OkHttpClient httpClient;
diff --git a/app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java b/app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java
index 86d623a4..9e689435 100644
--- a/app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java
+++ b/app/src/main/java/at/bitfire/davdroid/model/ServiceDB.java
@@ -91,7 +91,7 @@ public class ServiceDB {
 
         @Override
         public void onCreate(SQLiteDatabase db) {
-            App.log.info("Creating services database");
+            App.log.info("Creating database " + db.getPath());
 
             db.execSQL("CREATE TABLE " + Settings._TABLE + "(" +
                     Settings.NAME + " TEXT NOT NULL," +
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java
index 59273bff..4e931441 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java
@@ -58,22 +58,25 @@ public class LocalTaskList extends AndroidTaskList implements LocalCollection {
     }
 
     public static Uri create(Account account, TaskProvider provider, CollectionInfo info) throws CalendarStorageException {
-        ContentValues values = valuesFromCollectionInfo(info);
+        ContentValues values = valuesFromCollectionInfo(info, true);
         values.put(TaskLists.OWNER, account.name);
+        values.put(TaskLists.SYNC_ENABLED, 1);
+        values.put(TaskLists.VISIBLE, 1);
         return create(account, provider, values);
     }
 
-    public void update(CollectionInfo info) throws CalendarStorageException {
-        update(valuesFromCollectionInfo(info));
+    public void update(CollectionInfo info, boolean updateColor) throws CalendarStorageException {
+        update(valuesFromCollectionInfo(info, updateColor));
     }
 
-    private static ContentValues valuesFromCollectionInfo(CollectionInfo info) {
+    private static ContentValues valuesFromCollectionInfo(CollectionInfo info, boolean withColor) {
         ContentValues values = new ContentValues();
         values.put(TaskLists._SYNC_ID, info.url);
         values.put(TaskLists.LIST_NAME, !TextUtils.isEmpty(info.displayName) ? info.displayName : DavUtils.lastSegmentOfUrl(info.url));
-        values.put(TaskLists.LIST_COLOR, info.color != null ? info.color : defaultColor);
-        values.put(TaskLists.SYNC_ENABLED, 1);
-        values.put(TaskLists.VISIBLE, 1);
+
+        if (withColor)
+            values.put(TaskLists.LIST_COLOR, info.color != null ? info.color : defaultColor);
+
         return values;
     }
 
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.java
index 52f18e91..85448eb8 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.java
@@ -22,6 +22,8 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import org.dmfs.provider.tasks.TaskContract;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -65,10 +67,10 @@ public class TasksSyncAdapterService extends SyncAdapterService {
                 if (!extras.containsKey(ContentResolver.SYNC_EXTRAS_MANUAL) && !checkSyncConditions(settings))
                     return;
 
-                updateLocalTaskLists(provider, account);
+                updateLocalTaskLists(provider, account, settings);
 
-                for (LocalTaskList taskList : (LocalTaskList[])LocalTaskList.find(account, provider, LocalTaskList.Factory.INSTANCE, null, null)) {
-                    App.log.info("Synchronizing task list #"  + taskList.getId() + ", URL: " + taskList.getSyncId());
+                for (LocalTaskList taskList : (LocalTaskList[])LocalTaskList.find(account, provider, LocalTaskList.Factory.INSTANCE, TaskContract.TaskLists.SYNC_ENABLED + "!=0", null)) {
+                    App.log.info("Synchronizing task list #" + taskList.getId() + " [" + taskList.getSyncId() + "]");
                     TasksSyncManager syncManager = new TasksSyncManager(getContext(), account, settings, extras, authority, provider, syncResult, taskList);
                     syncManager.performSync();
                 }
@@ -81,7 +83,7 @@ public class TasksSyncAdapterService extends SyncAdapterService {
             App.log.info("Task sync complete");
         }
 
-        private void updateLocalTaskLists(TaskProvider provider, Account account) throws CalendarStorageException {
+        private void updateLocalTaskLists(TaskProvider provider, Account account, AccountSettings settings) throws CalendarStorageException {
             SQLiteOpenHelper dbHelper = new ServiceDB.OpenHelper(getContext());
             try {
                 // enumerate remote and local task lists
@@ -90,6 +92,8 @@ public class TasksSyncAdapterService extends SyncAdapterService {
                 Map<String, CollectionInfo> remote = remoteTaskLists(db, service);
                 LocalTaskList[] local = (LocalTaskList[])LocalTaskList.find(account, provider, LocalTaskList.Factory.INSTANCE, null, null);
 
+                boolean updateColors = settings.getManageCalendarColors();
+
                 // delete obsolete local task lists
                 for (LocalTaskList list : local) {
                     String url = list.getSyncId();
@@ -100,7 +104,7 @@ public class TasksSyncAdapterService extends SyncAdapterService {
                         // remote CollectionInfo found for this local collection, update data
                         CollectionInfo info = remote.get(url);
                         App.log.fine("Updating local task list " + url + " with " + info);
-                        list.update(info);
+                        list.update(info, updateColors);
                         // we already have a local task list for this remote collection, don't take into consideration anymore
                         remote.remove(url);
                     }
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e98a98e2..8668a2c2 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -3,20 +3,119 @@
   <!--common strings-->
   <string name="app_name">DAVdroid</string>
   <string name="help">Pomoc</string>
+  <string name="manage_accounts">Spravovat účty</string>
+  <string name="please_wait">Chvíli strpení ...</string>
   <string name="send">Odeslat</string>
   <!--startup dialogs-->
+  <string name="startup_dont_show_again">Již neukazovat</string>
+  <string name="startup_development_version">DAVdroid preview vydání</string>
+  <string name="startup_development_version_message">Toto je vývojová verze aplikace DAVdroid. Mějte na paměti, že vše nemusí správně fungovat. Budeme rádi za konstruktivní zpětnou vazbu, která pomůže vylepšit DAVdroid.</string>
+  <string name="startup_development_version_give_feedback">Dát zpětnou vazbu</string>
+  <string name="startup_donate">Open Source informace</string>
+  <string name="startup_donate_message">Jsme velice rádi že používáte DAVdroid, software s otevřeným zdrojovým kódem (GPLv3). Vývoj této aplikace je náročný a trval již několik tisíc hodin, velice nás potěší přispějete-li na jeho vývoj.</string>
+  <string name="startup_donate_now">Zobrazit stránku pro obdarování</string>
+  <string name="startup_donate_later">Možná později</string>
+  <string name="startup_google_play_accounts_removed">Informace o chybě DRM Obchodu Play</string>
+  <string name="startup_google_play_accounts_removed_message">Za určitých podmínek může dojít po restartu nebo aktualizaci aplikace DAVdroid k vymazání účtů kvůli chybě DRM Obchodu Play. Pokud jste postiženi touto chybou (ale pouze v tomto případě), nainstalujte prosím z Obchodu Play aplikaci \"DAVdroid JB Workaround\".</string>
+  <string name="startup_google_play_accounts_removed_more_info">Více informací</string>
+  <string name="startup_opentasks_not_installed">OpenTasks není nainstalován</string>
+  <string name="startup_opentasks_not_installed_message">Aplikace OpenTasks není dostupná, proto nebude DAVdroid moci synchronizovat seznam úkolů.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Po instalaci OpenTasks musíte PŘEINSTALOVAT DAVdroid a přidat znovu své účty (Android chyba).</string>
+  <string name="startup_opentasks_not_installed_install">Nainstalovat OpenTasks</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">Licenční podmínky</string>
+  <string name="about_license_info_no_warranty">Tento program je distribuován BEZ JAKÉKOLIV ZÁRUKY. Je to volně dostupný software a lze jej za určitých podmínek dále distribuovat.</string>
   <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid logování do souboru</string>
+  <string name="logging_to_external_storage">Logování do externího úložiště: %s</string>
+  <string name="logging_to_external_storage_warning">Smazat logy jak nejdříve možno!</string>
+  <string name="logging_couldnt_create_file">Nelze vytvořit externí soubor logu: %s</string>
+  <string name="logging_no_external_storage">Externí úložiště nenalezeno</string>
   <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Otevřít panel navigace</string>
+  <string name="navigation_drawer_close">Zavřít panel navigace</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV adapter synchronizace</string>
+  <string name="navigation_drawer_about">O aplikaci / Licence</string>
+  <string name="navigation_drawer_settings">Nastavení</string>
+  <string name="navigation_drawer_news_updates">Novinky &amp; aktualizace</string>
+  <string name="navigation_drawer_external_links">Externí odkazy</string>
+  <string name="navigation_drawer_website">Webová stránka</string>
+  <string name="navigation_drawer_faq">FAQ</string>
+  <string name="navigation_drawer_forums">Komunita</string>
+  <string name="navigation_drawer_donate">Obdarovat</string>
+  <string name="account_list_empty">Vítejte v aplikaci DAVdroid!\n\nNyní můžete přidat CalDAV/CardDAV účet.</string>
   <!--DavService-->
+  <string name="dav_service_refresh_failed">Vyhledání služby selhalo</string>
+  <string name="dav_service_refresh_couldnt_refresh">Nelze obnovit seznam sbírky</string>
   <!--AppSettingsActivity-->
+  <string name="app_settings">Nastavení</string>
+  <string name="app_settings_user_interface">Uživatelské prostředí</string>
+  <string name="app_settings_reset_hints">Resetovat nápovědu</string>
+  <string name="app_settings_reset_hints_summary">Znovu povolí vypnuté texty nápovědy</string>
+  <string name="app_settings_reset_hints_success">Budou zobrazovány všechny texty nápovědy</string>
+  <string name="app_settings_security">Zabezpečení</string>
+  <string name="app_settings_reset_trusted_certificates">Resetovat důvěryhodné certifikáty</string>
+  <string name="app_settings_reset_trusted_certificates_summary">Zapomene všechny dříve akceptované certifikáty</string>
+  <plurals name="app_settings_reset_trusted_certificates_success">
+    <item quantity="one">Znedůvěryhodněn jeden certifikát</item>
+    <item quantity="few">Znedůvěryhodněny %d certifikáty</item>
+    <item quantity="other">Znedůvěryhodněno %d certifikátů</item>
+  </plurals>
+  <string name="app_settings_debug">Ladění</string>
+  <string name="app_settings_log_to_external_storage">Logovat do externího souboru</string>
+  <string name="app_settings_log_to_external_storage_on">Logování do externího úložiště (pokud dostupné)</string>
+  <string name="app_settings_log_to_external_storage_off">Logování do externího souboru je vypnuto</string>
+  <string name="app_settings_show_debug_info">Zobrazit ladící informace</string>
+  <string name="app_settings_show_debug_info_details">Zobrazit/sdílet software a detaily konfigurace</string>
   <!--AccountActivity-->
+  <string name="account_synchronize_now">Synchronizovat nyní</string>
+  <string name="account_synchronizing_now">Probíhá synchronizace</string>
+  <string name="account_settings">Nastavení účtu</string>
+  <string name="account_delete">Smazat účet</string>
+  <string name="account_delete_confirmation_title">Opravdu smazat účet?</string>
+  <string name="account_delete_confirmation_text">Všechny místní kopie adresáře, kalendářů a úkolů budou smazány.</string>
+  <string name="account_refresh_address_book_list">Obnovit seznam adresářů</string>
+  <string name="account_create_new_address_book">Vytvořit nový adresář</string>
+  <string name="account_refresh_calendar_list">Obnovit seznam kalendářů</string>
+  <string name="account_create_new_calendar">Vytvořit nový kalendář</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid oprávnění</string>
+  <string name="permissions_calendar">Oprávnění pro kalendáře</string>
+  <string name="permissions_calendar_details">Pro synchronizaci CalDAV událostí s místním kalendářem potřebuje DAVdroid oprávnění přistupovat ke kalendářům.</string>
+  <string name="permissions_calendar_request">Vyžádat oprávnění kalendáře</string>
+  <string name="permissions_contacts">Oprávnění pro kontakty</string>
+  <string name="permissions_contacts_details">Pro synchronizaci CardDAV adresářů s místními kontakty potřebuje DAVdroid oprávnění přistupovat ke kontaktům.</string>
+  <string name="permissions_contacts_request">Vyžádat oprávnění kontaktů</string>
+  <string name="permissions_opentasks">Oprávnění pro OpenTasks</string>
+  <string name="permissions_opentasks_details">Pro synchronizaci CalDAV událostí s místním seznamem úkolů potřebuje DAVdroid oprávnění přistupovat k OpenTasks.</string>
+  <string name="permissions_opentasks_request">Vyžádat oprávnění OpenTasks</string>
   <!--AddAccountActivity-->
+  <string name="login_title">Přidat účet</string>
   <string name="login_type_email">Přihlášení s emailovou adresou</string>
+  <string name="login_email_address">Emailová adresa</string>
+  <string name="login_email_address_error">Vyžadován platný email</string>
+  <string name="login_password">Heslo</string>
+  <string name="login_password_required">Vyžadováno heslo</string>
   <string name="login_type_url">Přihlášení s URL a uživatelským jménem</string>
+  <string name="login_url_must_be_http_or_https">URL musí začínat na http(s)://</string>
+  <string name="login_url_host_name_required">Vyžadováno hostname</string>
+  <string name="login_user_name">Uživatelské jméno</string>
+  <string name="login_user_name_required">Vyžadováno uživatelské jméno</string>
+  <string name="login_base_url">Základní URL</string>
   <string name="login_auth_preemptive">Preemptivní ověření (doporučeno, ale není kompatibilní s Digest ověřením)</string>
+  <string name="login_login">Login</string>
+  <string name="login_back">Zpět</string>
+  <string name="login_create_account">Vytvořit účet</string>
+  <string name="login_account_name">Jméno účtu</string>
+  <string name="login_account_name_info">Pro jméno účtu použijte svou emailovou adresu, protože Android bude brát jméno účtu jako údaj pro ORGANIZÁTORA vytvořených událostí. Nelze mít dva účty stejného jména.</string>
+  <string name="login_account_name_required">Vyžadováno jméno účtu</string>
+  <string name="login_account_not_created">Účet nelze vytvořit</string>
+  <string name="login_configuration_detection">Vyhledání konfigurace</string>
+  <string name="login_querying_server">Chvíli strpení, probíhá dotazování serveru...</string>
+  <string name="login_no_caldav_carddav">Nelze nalézt službu CalDAV nebo CardDAV.</string>
+  <string name="login_view_logs">Prohlížet logy</string>
   <!--AccountSettingsActivity-->
+  <string name="settings_title">Nastavení: %s</string>
   <string name="settings_authentication">Ověření</string>
   <string name="settings_username">Uživatelské jméno</string>
   <string name="settings_enter_username">Zadat uživatelské jméno</string>
@@ -53,10 +152,58 @@
     <item>Každé 4 hodiny</item>
     <item>Jednou za den</item>
   </string-array>
+  <string name="settings_sync_wifi_only">Synchronizovat pouze přes WiFi</string>
+  <string name="settings_sync_wifi_only_on">Synchronizace omezena na WiFi připojení</string>
+  <string name="settings_sync_wifi_only_off">Druh připojení není brán v potaz</string>
+  <string name="settings_sync_wifi_only_ssid">Omezení WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Synchronizace pouze přes %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Použít všechna WiFi připojení</string>
+  <string name="settings_sync_wifi_only_ssid_message">Zadejte jméno WiFi sítě (SSID) pro omezení synchronizace na tutu síť, nebo ponechte prázdné pro použití všech WiFi připojení.</string>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Časový limit pro staré události</string>
+  <string name="settings_sync_time_range_past_none">Synchronizovat všechny události</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Ignorovat události starší než 1 den</item>
+    <item quantity="few">Ignorovat události starší než %d dny</item>
+    <item quantity="other">Ignorovat události starší než %d dnů</item>
+  </plurals>
+  <string name="settings_sync_time_range_past_message">Události z minulosti starší než vyznačený počet dnů budou ignorovány (lze zadat 0). Ponechte prázdné pro synchronizaci všech událostí.</string>
+  <string name="settings_manage_calendar_colors">Spravovat barvy kalendářů</string>
+  <string name="settings_manage_calendar_colors_on">Barvy kalendářů spravuje DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Barvy kalendářů nespravuje DAVdroid</string>
+  <string name="settings_version_update">Aktualizace verze DAVdroid</string>
+  <string name="settings_version_update_settings_updated">Vnitřní nastavení byla aktualizována.</string>
+  <string name="settings_version_update_install_hint">Při problémech odinstalujte a znovu nainstalujte DAVdroid.</string>
   <!--collection management-->
+  <string name="create_addressbook">Vytvořit adresář</string>
+  <string name="create_addressbook_display_name_hint">Můj adresář</string>
+  <string name="create_calendar">Vytvořit CalDAV sbírku</string>
+  <string name="create_calendar_display_name_hint">Můj kalendář</string>
+  <string name="create_calendar_time_zone">Časová zóna:</string>
+  <string name="create_calendar_type">Typ sbírky:</string>
+  <string name="create_calendar_type_only_events">Kalendář (pouze události)</string>
+  <string name="create_calendar_type_only_tasks">Seznam úkolů (pouze úkoly)</string>
+  <string name="create_calendar_type_events_and_tasks">Kombinovaná (události a úkoly)</string>
+  <string name="create_collection_color">Nastavit barvu sbírky</string>
+  <string name="create_collection_creating">Vytváření sbírky</string>
+  <string name="create_collection_display_name">Zobrazit jméno (nadpis) této sbírky:</string>
+  <string name="create_collection_display_name_required">Nadpis je vyžadován</string>
+  <string name="create_collection_description">Popis (volitelný):</string>
+  <string name="create_collection_home_set">Domácí sbírka:</string>
+  <string name="create_collection_create">Vytvořit</string>
+  <string name="delete_collection">Smazat sbírku</string>
+  <string name="delete_collection_confirm_title">Jste si jisti?</string>
+  <string name="delete_collection_confirm_warning">Tato sbírka (%s) a všechna její data budou odstraněna ze serveru.</string>
+  <string name="delete_collection_deleting_collection">Mazání sbírky</string>
   <!--ExceptionInfoFragment-->
+  <string name="exception">Došlo k chybě.</string>
+  <string name="exception_httpexception">Došlo k HTTP chybě.</string>
+  <string name="exception_ioexception">Došlo k I/O chybě.</string>
+  <string name="exception_show_details">Zobrazit detaily</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">Ladící informace</string>
+  <string name="sync_error_permissions">DAVdroid oprávnění</string>
+  <string name="sync_error_permissions_text">Vyžadována dodatečná oprávnění</string>
   <string name="sync_error_calendar">Synchronizace kalendáře selhala (%s)</string>
   <string name="sync_error_contacts">Synchronizace adresáře selhala (%s)</string>
   <string name="sync_error_tasks">Synchronizace úkolu selhala (%s)</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2c4e6aca..3d926f77 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -13,7 +13,7 @@
   <string name="startup_development_version_give_feedback">Faire un commentaire</string>
   <string name="startup_donate">Open-Source Information</string>
   <string name="startup_donate_message">Nous sommes heureux que vous utilisez DAVdroid, qui est un logiciel open-source (GPLv3). Parce que développer DAVdroid est un travail difficile et nous a pris de nombreuses heures, s\'il vous plaît envisager de faire un don.</string>
-  <string name="startup_donate_now">Voir la page de don</string>
+  <string name="startup_donate_now">Faire un don</string>
   <string name="startup_donate_later">Plus tard</string>
   <string name="startup_google_play_accounts_removed">Erreur information Play Store DRM</string>
   <string name="startup_google_play_accounts_removed_message">Dans certaines conditions, Play Store DRM peut provoquer la disparition de tous les comptes DAVdroid après un redémarrage ou après la mise à niveau de DAVdroid. Si vous êtes concerné par ce problème (et seulement alors), s\'il vous plaît installer \"DAVdroid JB Solution\" du Play Store.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 235080d0..494898e0 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -19,6 +19,8 @@
   <string name="startup_google_play_accounts_removed_message">Bizonyos körülmények között  a Play Áruház DRM okozhatja azt, hogy az eszköz újraindítását vagy a DAVdroid frissítését követően a DAVdroid fiókok eltűnnek.  Amennyiben (és csak amennyiben) érinti Önt ez a probléma, telepítse a \"DAVdroid JB Workaround\" alkalmazást Play Áruházból.</string>
   <string name="startup_google_play_accounts_removed_more_info">További információk</string>
   <string name="startup_opentasks_not_installed">Az OpenTasks nincs telepítve</string>
+  <string name="startup_opentasks_not_installed_message">Az OpenTasks alkalmazás nincs telepítve, így a DAVdroid nem lesz képes szinkronizálni feladatlistákat.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Az OpenTasks telepítését követően újra kell telepíteni a DAVdroit alkalmazást és újra fel kell venni a fiókokat (Android hiba).</string>
   <string name="startup_opentasks_not_installed_install">Az OpenTasks telepítése</string>
   <!--AboutActivity-->
   <string name="about_license_terms">Licencfeltételek</string>
@@ -76,6 +78,16 @@
   <string name="account_refresh_calendar_list">Naptárlista frissítése</string>
   <string name="account_create_new_calendar">Új naptár létrehozása</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid engedélyek </string>
+  <string name="permissions_calendar">Naptárengedély</string>
+  <string name="permissions_calendar_details">A CalDAV naptárak és a helyi naptárak szinkronizálásához a DAVdroid naptárhozzáférést igényel.</string>
+  <string name="permissions_calendar_request">Naptárhozzáférés igénylése</string>
+  <string name="permissions_contacts">Névjegyengedélyek</string>
+  <string name="permissions_contacts_details">A CardDAV címlisták és a helyi címlisták szinkronizálásához a névjegyhozzáférést igényel.</string>
+  <string name="permissions_contacts_request">Névjegyengedélyek igénylése</string>
+  <string name="permissions_opentasks">OpenTasks engedélyek</string>
+  <string name="permissions_opentasks_details">A CalDAV feladatlisták és a helyi feladatlisták szinkronizálásához a DAVdroid OpenTasks hozzáférést igényel.</string>
+  <string name="permissions_opentasks_request">OpenTasks engedélyek igénylése</string>
   <!--AddAccountActivity-->
   <string name="login_title">Fiók hozzáadása</string>
   <string name="login_type_email">Bejelentkezés email cím segítségével</string>
@@ -146,6 +158,7 @@
   <string name="settings_sync_wifi_only_ssid_on">Szinkronizálás csak a(z) %s hálózatra kapcsolódva</string>
   <string name="settings_sync_wifi_only_ssid_off">Szinkronizálás bármely WIFI hálózaton</string>
   <string name="settings_sync_wifi_only_ssid_message">Adja meg a WIFI hálózat nevét (SSID) a szinkronizálás egy hálózatra való korlátozához, vagy hagyja üresen, ha nem akar ilyen szűkítést.</string>
+  <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">Múltbéli események időkorlátja</string>
   <string name="settings_sync_time_range_past_none">Minden esemény szinkronizálása</string>
   <plurals name="settings_sync_time_range_past_days">
@@ -187,6 +200,8 @@
   <string name="exception_show_details">Részletek megjelenítése</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">Hibakeresési információ</string>
+  <string name="sync_error_permissions">DAVdroid engedélyek </string>
+  <string name="sync_error_permissions_text">További engedélyek szükségesek</string>
   <string name="sync_error_calendar">A naptár szinkronizálása nem sikerült (%s)</string>
   <string name="sync_error_contacts">A címjegyzék szinkronizálása nem sikerült (%s)</string>
   <string name="sync_error_tasks">A feladatok szinkronizálása nem sikerült (%s)</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 74fc4a92..2fd77328 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,6 +19,8 @@
   <string name="startup_google_play_accounts_removed_message">特定の条件下で、DAVdroid を再起動後またはアップグレードした後、Play ストア DRM によりすべての DAVdroid アカウントがなくなる可能性があります。この問題の影響を受けている場合 (のみ)、Play ストアから「DAVdroid JB 回避策」をインストールしてください。</string>
   <string name="startup_google_play_accounts_removed_more_info">追加情報</string>
   <string name="startup_opentasks_not_installed">OpenTasks がインストールされていません</string>
+  <string name="startup_opentasks_not_installed_message">OpenTasks アプリが利用できないため、DAVdroid はタスクリストを同期することができません。</string>
+  <string name="startup_opentasks_reinstall_davdroid">OpenTasks をインストールした後で、DAVdroidを再インストールして、再度アカウントを追加してください (Android のバグ)。</string>
   <string name="startup_opentasks_not_installed_install">OpenTasks をインストール</string>
   <!--AboutActivity-->
   <string name="about_license_terms">ライセンス規約</string>
@@ -75,6 +77,16 @@
   <string name="account_refresh_calendar_list">カレンダーリストを更新</string>
   <string name="account_create_new_calendar">新しいカレンダーを作成</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid アクセス許可</string>
+  <string name="permissions_calendar">カレンダー アクセス許可</string>
+  <string name="permissions_calendar_details">ローカルのカレンダーと CalDAV イベントを同期するため、DAVdroid がカレンダーにアクセスする必要があります。</string>
+  <string name="permissions_calendar_request">カレンダー アクセス許可の要求</string>
+  <string name="permissions_contacts">連絡先アクセス許可</string>
+  <string name="permissions_contacts_details">ローカルの連絡先と CalDAV アドレス帳を同期するため、DAVdroid が連絡先にアクセスする必要があります。</string>
+  <string name="permissions_contacts_request">連絡先アクセス許可の要求</string>
+  <string name="permissions_opentasks">OpenTasks アクセス許可</string>
+  <string name="permissions_opentasks_details">ローカルのタスクリストと CalDAV タスクを同期するため、DAVdroid が OpenTasks にアクセスする必要があります。</string>
+  <string name="permissions_opentasks_request">OpenTasks アクセス許可の要求</string>
   <!--AddAccountActivity-->
   <string name="login_title">アカウントを追加</string>
   <string name="login_type_email">メールアドレスでログイン</string>
@@ -145,6 +157,7 @@
   <string name="settings_sync_wifi_only_ssid_on">%s でのみ同期します</string>
   <string name="settings_sync_wifi_only_ssid_off">すべての WiFi 接続を使用することができます</string>
   <string name="settings_sync_wifi_only_ssid_message">このネットワークで同期を制限する WiFi ネットワーク (SSID) の名前を入力してください。すべての WiFi 接続は空白のままにします。</string>
+  <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">過去イベントの時間限度</string>
   <string name="settings_sync_time_range_past_none">すべてのイベントが同期されます</string>
   <plurals name="settings_sync_time_range_past_days">
@@ -185,6 +198,8 @@
   <string name="exception_show_details">詳細を表示</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">デバッグ情報</string>
+  <string name="sync_error_permissions">DAVdroid アクセス許可</string>
+  <string name="sync_error_permissions_text">追加のアクセス許可が必要です</string>
   <string name="sync_error_calendar">カレンダーの同期に失敗しました (%s)</string>
   <string name="sync_error_contacts">アドレス帳の同期に失敗しました (%s)</string>
   <string name="sync_error_tasks">タスクの同期に失敗しました (%s)</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8f8d1edd..c6e91105 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -19,6 +19,8 @@
   <string name="startup_google_play_accounts_removed_message">Onder bepaalde omstandigheden, kan Play Store DRM ervoor zorgen dat accounts kwijt zijn na een herstart of na een DAVdroid update. Als dit probleem zich bij je voordoet (en alleen dan), Installeer dan \"DAVdroid JB Workaround\" vanuit de Play Store</string>
   <string name="startup_google_play_accounts_removed_more_info">Meer informatie</string>
   <string name="startup_opentasks_not_installed">OpenTasks niet geinstalleerd</string>
+  <string name="startup_opentasks_not_installed_message">De OpenTasks app is niet beschikbaar, Hierdoor is het voor DAVdroid niet mogelijk om uw taken te synchroniseren.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Na installatie van OpenTasks dient u DAVdroid opnieuw te installeren en de accounts toe te voegen (Android bug).</string>
   <string name="startup_opentasks_not_installed_install">OpenTasks installeren</string>
   <!--AboutActivity-->
   <string name="about_license_terms">Licentie voorwaarden</string>
@@ -54,17 +56,21 @@
   <string name="app_settings_security">Beveiliging</string>
   <string name="app_settings_reset_trusted_certificates">Vertrouwde certificaten resetten</string>
   <string name="app_settings_reset_trusted_certificates_summary">Vergeet alle eerder geaccepteerde certificaten</string>
+  <plurals name="app_settings_reset_trusted_certificates_success">
+    <item quantity="one">Onbetrouwbaar certificaat</item>
+    <item quantity="other">Onbetrouwbaar %d certificaten</item>
+  </plurals>
   <string name="app_settings_debug">Debuggen</string>
   <string name="app_settings_log_to_external_storage">Log naar extern bestand</string>
   <string name="app_settings_log_to_external_storage_on">Loggen naar externe opslag (wanneer beschikbaar)</string>
   <string name="app_settings_log_to_external_storage_off">Extern bestands loggen uitgeschakeld</string>
-  <string name="app_settings_show_debug_info">Toon debug info</string>
+  <string name="app_settings_show_debug_info">Debug info tonen</string>
   <string name="app_settings_show_debug_info_details">Bekijk/deel software configuratie details</string>
   <!--AccountActivity-->
-  <string name="account_synchronize_now">Nu synchronizeren</string>
+  <string name="account_synchronize_now">Synchroniseer nu</string>
   <string name="account_synchronizing_now">Aan het synchronizeren...</string>
   <string name="account_settings">Account instellingen</string>
-  <string name="account_delete">Verwijder account</string>
+  <string name="account_delete">Account verwijderen</string>
   <string name="account_delete_confirmation_title">Account echt verwijderen?</string>
   <string name="account_delete_confirmation_text">Alle lokale kopieën van adresboeken, agenda\'s en taken worden verwijderd.</string>
   <string name="account_refresh_address_book_list">Adresboeken vernieuwen</string>
@@ -72,6 +78,16 @@
   <string name="account_refresh_calendar_list">Agenda\'s vernieuwen</string>
   <string name="account_create_new_calendar">Maak een nieuwe agenda</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid rechten</string>
+  <string name="permissions_calendar">Agenda rechten</string>
+  <string name="permissions_calendar_details">Om CalDAV afspraken te synchroniseren met u agenda dient DAVdroid toegang te verkrijgen. </string>
+  <string name="permissions_calendar_request">Agenda rechten verkrijgen</string>
+  <string name="permissions_contacts">Contact rechten</string>
+  <string name="permissions_contacts_details">Om CalDAV afspraken te synchroniseren met u contacten dient DAVdroid toegang te verkrijgen. </string>
+  <string name="permissions_contacts_request">Contacten rechten verkrijgen</string>
+  <string name="permissions_opentasks">OpenTasks rechten</string>
+  <string name="permissions_opentasks_details">Om CalDAV taken te synchroniseren met uw local takenlijst dient DAVdroid toegang te hebben tot OpenTasks</string>
+  <string name="permissions_opentasks_request">OpenTasks rechten verkrijgen</string>
   <!--AddAccountActivity-->
   <string name="login_title">Account toevoegen</string>
   <string name="login_type_email">Inloggen met e-mailadres</string>
@@ -135,10 +151,22 @@
     <item>Elke 4 uur</item>
     <item>Dagelijks</item>
   </string-array>
+  <string name="settings_sync_wifi_only">Sync alleen tijdens WiFi</string>
+  <string name="settings_sync_wifi_only_on">Synchronisatie is voorbehouden tijdens WiFi verbindingen</string>
+  <string name="settings_sync_wifi_only_off">Verbinding type is niet overwogen</string>
+  <string name="settings_sync_wifi_only_ssid">WiFi SSID beperking</string>
+  <string name="settings_sync_wifi_only_ssid_on">Zal alleen synchroniseren over %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Alle WiFI verbindingen mogen worden gebruikt</string>
+  <string name="settings_sync_wifi_only_ssid_message">Type de naam van het WiFi netwerk (SSID) om synchronisatie tot dit netwerk te beperken. Leeg laten voor sync over alle netwerken.</string>
+  <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">Tijdslimiet verleden afspraken</string>
   <string name="settings_sync_time_range_past_none">Alle afspraken worden gesynchronizeerd</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="one">Afspraken ouder dan een dag worden genegeerd</item>
+    <item quantity="other">Afspraken ouder dan %d dagen worden genegeerd</item>
+  </plurals>
   <string name="settings_sync_time_range_past_message">Afspraken ouder dan dit aantal dagen worden genegeerd (mag 0 zijn). Laat leeg om alle afspraken te synchronizeren.</string>
-  <string name="settings_manage_calendar_colors">Beheer agenda kleuren</string>
+  <string name="settings_manage_calendar_colors">Agenda kleuren beheren</string>
   <string name="settings_manage_calendar_colors_on">Agenda kleuren worden door DAVdroid beheerd.</string>
   <string name="settings_manage_calendar_colors_off">Agenda kleuren worden niet door DAVdroid ingesteld</string>
   <string name="settings_version_update">DAVdroid versie update</string>
@@ -159,6 +187,7 @@
   <string name="create_collection_display_name">Weergave naam (titel) van deze collectie:</string>
   <string name="create_collection_display_name_required">Titel is vereist</string>
   <string name="create_collection_description">Beschrijving (optioneel):</string>
+  <string name="create_collection_home_set">Begin map:</string>
   <string name="create_collection_create">Maak</string>
   <string name="delete_collection">Verwijder collectie</string>
   <string name="delete_collection_confirm_title">Weet je het zeker?</string>
@@ -171,6 +200,8 @@
   <string name="exception_show_details">Toon details</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">Debug informatie</string>
+  <string name="sync_error_permissions">DAVdroid rechten</string>
+  <string name="sync_error_permissions_text">Aanvullende rechten vereist</string>
   <string name="sync_error_calendar">Agenda synchronisatie is mislukt (%s)</string>
   <string name="sync_error_contacts">Adresboek synchronisatie is mislukt (%s)</string>
   <string name="sync_error_tasks">Taak synchronisatie is mislukt (%s)</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index e6d114c0..7bb4643d 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -189,6 +189,7 @@
   <string name="create_collection_display_name">Назив (наслов) ове збирке:</string>
   <string name="create_collection_display_name_required">Наслов је обавезан</string>
   <string name="create_collection_description">Опис (необавезан):</string>
+  <string name="create_collection_home_set">Домаћа фасцикла:</string>
   <string name="create_collection_create">Направи</string>
   <string name="delete_collection">Обриши збирку</string>
   <string name="delete_collection_confirm_title">Да ли сте сигурни?</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index e7d685a1..c1033688 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -3,20 +3,113 @@
   <!--common strings-->
   <string name="app_name">DAVdroid</string>
   <string name="help">Yardım</string>
+  <string name="manage_accounts">Hesapları yönet</string>
+  <string name="please_wait">Lütfen bekle ...</string>
   <string name="send">Gönder</string>
   <!--startup dialogs-->
+  <string name="startup_dont_show_again">Bir daha gösterme</string>
+  <string name="startup_development_version">DAVDroid Önizlenim Dağıtımı</string>
+  <string name="startup_development_version_give_feedback">Geribildirim ver</string>
+  <string name="startup_donate">Açık-Kaynak Bilgisi</string>
+  <string name="startup_donate_now">Bağış sayfasını göster</string>
+  <string name="startup_donate_later">Belki sonra</string>
+  <string name="startup_google_play_accounts_removed">Play Store DRM hata bilgisi</string>
+  <string name="startup_google_play_accounts_removed_more_info">Daha fazla bilgi</string>
+  <string name="startup_opentasks_not_installed">OpenTasks kurulu değil</string>
+  <string name="startup_opentasks_not_installed_message">OpenTasks uygulaması yok, dolayısıyla DAVdroid iş listelerini senkronize edemeyecektir.</string>
+  <string name="startup_opentasks_not_installed_install">OpenTasks kur</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">Lisans şartları</string>
+  <string name="about_license_info_no_warranty">Bu uygulama HİÇ BİR GARANTİ ile gelmemektedir. Bedava bir yazılımdır ve belli koşullar altında dağıtabilirsiniz.</string>
   <!--global settings-->
+  <string name="logging_davdroid_file_logging">DAVdroid dosya jurnallemesi</string>
+  <string name="logging_to_external_storage">Harici depolamaya jurnalleniyor: %s</string>
+  <string name="logging_to_external_storage_warning">Jurnalleri bir an önce silin!</string>
+  <string name="logging_couldnt_create_file">Harici jurnal dosyası yaratılamadı: %s </string>
+  <string name="logging_no_external_storage">Harici depolama alanı bulunamadı</string>
   <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Navigasyon çekmecesini aç</string>
+  <string name="navigation_drawer_close">Navigasyon çekmecesini kapat</string>
+  <string name="navigation_drawer_subtitle">CalDAV/CardDAV Senkronizasyon Adaptörü</string>
+  <string name="navigation_drawer_about">Hakkında / Lisans</string>
+  <string name="navigation_drawer_settings">Ayarlar</string>
+  <string name="navigation_drawer_news_updates">Haberler  &amp; güncellemeler </string>
+  <string name="navigation_drawer_external_links">Harici bağlantılar</string>
+  <string name="navigation_drawer_website">Web sitesi</string>
+  <string name="navigation_drawer_faq">SSS</string>
+  <string name="navigation_drawer_forums">Camia</string>
+  <string name="navigation_drawer_donate">Bağış yap</string>
+  <string name="account_list_empty">DAVdroid\'e hoşgeldin!\n\nŞimdi bir CalDAV/CardDAV hesabı ekleyebilirsin.</string>
   <!--DavService-->
+  <string name="dav_service_refresh_failed">Servis keşfi başarısız</string>
+  <string name="dav_service_refresh_couldnt_refresh">Kolleksiyon listesi yenilenemedi</string>
   <!--AppSettingsActivity-->
+  <string name="app_settings">Ayarlar</string>
+  <string name="app_settings_user_interface">Kullanıcı arayüzü</string>
+  <string name="app_settings_reset_hints">İpuçlarını sıfırla</string>
+  <string name="app_settings_reset_hints_summary">Daha önceden azat edilen ipuçlarını yeniden etkinleştirir</string>
+  <string name="app_settings_reset_hints_success">Tüm ipuçları artık gösterilecek</string>
+  <string name="app_settings_security">Güvenlik</string>
+  <string name="app_settings_reset_trusted_certificates">Güvenilen sertifikaları sıfırla</string>
+  <string name="app_settings_reset_trusted_certificates_summary">Daha önceden kabul edilmiş tüm sertifikaları unutur</string>
+  <plurals name="app_settings_reset_trusted_certificates_success">
+    <item quantity="other">Güvenilmeyen %d sertifikaları</item>
+  </plurals>
+  <string name="app_settings_debug">Hata ayıklama</string>
+  <string name="app_settings_log_to_external_storage">Harici dosyaya jurnalle</string>
+  <string name="app_settings_log_to_external_storage_on">Harici depolamaya jurnalleniyor (eğer uygunsa)</string>
+  <string name="app_settings_log_to_external_storage_off">Harici depolama mevcut değil</string>
+  <string name="app_settings_show_debug_info">Hata ayıklama bilgilerini göster</string>
+  <string name="app_settings_show_debug_info_details">Yazılım ve konfigürasyon detaylarına bak/paylaş</string>
   <!--AccountActivity-->
+  <string name="account_synchronize_now">Şimdi senkronize et</string>
+  <string name="account_synchronizing_now">Senkronize ediyor</string>
+  <string name="account_settings">Hesap ayarları</string>
+  <string name="account_delete">Hesabı sil</string>
+  <string name="account_delete_confirmation_title">Hesap gerçekten silinsin mi?</string>
+  <string name="account_delete_confirmation_text">Rehber, takvim ve iş listelerinin tüm yerel kopyaları silinecektir.</string>
+  <string name="account_refresh_address_book_list">Rehber listesini yenile</string>
+  <string name="account_create_new_address_book">Yeni rehber oluştur</string>
+  <string name="account_refresh_calendar_list">Takvim listesini yenile</string>
+  <string name="account_create_new_calendar">Yeni takvim oluştur</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid izinleri</string>
+  <string name="permissions_calendar">Takvim izinleri</string>
+  <string name="permissions_calendar_details">Takvim (sadece olaylar)
+</string>
+  <string name="permissions_calendar_request">Takvim izinleri iste</string>
+  <string name="permissions_contacts">Kişiler izinleri</string>
+  <string name="permissions_contacts_details">CardDAV rehberlerinin cihazınızdaki kişilerinizle senkronize edebilmek için, DAVdroid cihazınızdaki kişilerinize erişime ihtiyacı vardır.</string>
+  <string name="permissions_contacts_request">Kişiler izinleri iste</string>
+  <string name="permissions_opentasks">OpenTasks izinleri</string>
+  <string name="permissions_opentasks_details">CalDav iş listelerinizi yerel iş listelerinizle senkronize edebilmek için DAVdroid\'in OpenTasks\'e erişime ihtiyacı vardır.</string>
+  <string name="permissions_opentasks_request">OpenTasks izinleri iste</string>
   <!--AddAccountActivity-->
+  <string name="login_title">Hesap ekle</string>
   <string name="login_type_email">Eposta adresi ile giriş yap</string>
+  <string name="login_email_address">Eposta adresi</string>
+  <string name="login_email_address_error">Geçerli eposta adresi zorunludur</string>
+  <string name="login_password">Parola</string>
+  <string name="login_password_required">Parola zorunludur</string>
   <string name="login_type_url">URL ve kullanıcı adı ile giriş yap</string>
+  <string name="login_url_must_be_http_or_https">URL http(s):// ile başlamalıdır</string>
+  <string name="login_url_host_name_required">Sunucu adı zorunludur</string>
+  <string name="login_user_name">Kullanıcı adı</string>
+  <string name="login_user_name_required">Kullanıcı adı zorunludur</string>
+  <string name="login_base_url">Baz URL</string>
   <string name="login_auth_preemptive">Önleyici doğrulama (tavsiye edilir, fakat Digest doğrulama ile uyumsuz)</string>
+  <string name="login_login">Giriş</string>
+  <string name="login_back">Geri</string>
+  <string name="login_create_account">Hesap yarat</string>
+  <string name="login_account_name">Hesap adı</string>
+  <string name="login_account_name_required">Hesap adı zorunludur</string>
+  <string name="login_account_not_created">Hesap yaratılamadı</string>
+  <string name="login_configuration_detection">Konfigürasyon keşfi</string>
+  <string name="login_querying_server">Lütfen bekle, sunucu sorgulanıyor...</string>
+  <string name="login_no_caldav_carddav">CalDAV veya CardDAV servisi bulunamadı.</string>
+  <string name="login_view_logs">Jurnallere bak</string>
   <!--AccountSettingsActivity-->
+  <string name="settings_title">Ayarlar: %s</string>
   <string name="settings_authentication">Doğrulama</string>
   <string name="settings_username">Kullanıcı adı</string>
   <string name="settings_enter_username">Kullanıcı adı girin:</string>
@@ -53,10 +146,55 @@
     <item>Her 4 saatte bir</item>
     <item>Günde bir</item>
   </string-array>
+  <string name="settings_sync_wifi_only">Sadece WiFi üzerinden senkronize et</string>
+  <string name="settings_sync_wifi_only_on">Senkronizasyon WiFi bağlantıları ile kısıtlıdır</string>
+  <string name="settings_sync_wifi_only_off">Bağlantı tipi göz önünde bulundurulmaz</string>
+  <string name="settings_sync_wifi_only_ssid">WiFi SSID kısıtlaması</string>
+  <string name="settings_sync_wifi_only_ssid_on">Sadece %s üzerinden senkronize olur</string>
+  <string name="settings_sync_wifi_only_ssid_off">Tüm WiFi bağlantıları kullanılabilir</string>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past">Geçmiş olay zaman sınırı</string>
+  <string name="settings_sync_time_range_past_none">Tüm olaylar senkronize edilecek</string>
+  <plurals name="settings_sync_time_range_past_days">
+    <item quantity="other">%d günden daha eski olaylar göz ardı edilecektir</item>
+  </plurals>
+  <string name="settings_manage_calendar_colors">Takvim renklerini yönet</string>
+  <string name="settings_manage_calendar_colors_on">Takvim renkleri DAVdroid tarafından yönetilmekte</string>
+  <string name="settings_manage_calendar_colors_off">Takvim renkleri DAVdroid tarafından ayarlanmadı</string>
+  <string name="settings_version_update">DAVdroid sürüm güncellemesi</string>
+  <string name="settings_version_update_settings_updated">Dahili ayarlar güncellendi.</string>
+  <string name="settings_version_update_install_hint">Sorunlar mı var? DAVdroid\'i kaldırıp, yeniden kurun.</string>
   <!--collection management-->
+  <string name="create_addressbook">Rehber yarat</string>
+  <string name="create_addressbook_display_name_hint">Benim Rehberim</string>
+  <string name="create_calendar">CalDav koleksiyonu yarat</string>
+  <string name="create_calendar_display_name_hint">Benim Takvimim</string>
+  <string name="create_calendar_time_zone">Saat dilimi:</string>
+  <string name="create_calendar_type">Koleksiyon Tipi:</string>
+  <string name="create_calendar_type_only_events">Takvim (sadece olaylar)</string>
+  <string name="create_calendar_type_only_tasks">İşler listesi (sadece işler)
+</string>
+  <string name="create_calendar_type_events_and_tasks">Birleşik (olaylar ve işler)</string>
+  <string name="create_collection_color">Bir koleksiyon rengi tanımla</string>
+  <string name="create_collection_creating">Koleksiyon yaratılıyor</string>
+  <string name="create_collection_display_name">Bu koleksiyonun gösterilen adı (başlığı):</string>
+  <string name="create_collection_display_name_required">Başlık zorunlu</string>
+  <string name="create_collection_description">Açıklama (isteğe bağlı):</string>
+  <string name="create_collection_home_set">Ev seti:</string>
+  <string name="create_collection_create">Yarat</string>
+  <string name="delete_collection">Koleksiyonu sil</string>
+  <string name="delete_collection_confirm_title">Emin misin?</string>
+  <string name="delete_collection_confirm_warning">Bu koleksiyon (%s) ve tüm verisi sunucudan silinecek.</string>
+  <string name="delete_collection_deleting_collection">Koleksiyon siliniyor</string>
   <!--ExceptionInfoFragment-->
+  <string name="exception">Bir hata oluştu.</string>
+  <string name="exception_httpexception">Bir HTTP hatası oluştu.</string>
+  <string name="exception_ioexception">Bir I/O hatası oluştu.</string>
+  <string name="exception_show_details">Detayları göster</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">Hata ayıklama bilgisi</string>
+  <string name="sync_error_permissions">DAVdroid izinleri</string>
+  <string name="sync_error_permissions_text">Ek izinler zorunludur</string>
   <string name="sync_error_calendar">Takvim senkronizasyonu başarısız (%s)</string>
   <string name="sync_error_contacts">Rehber senkronizasyonu başarısız (%s)</string>
   <string name="sync_error_tasks">İş senkronizasyonu başarısız (%s)</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b3a595b6..2f97cd05 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -19,6 +19,8 @@
   <string name="startup_google_play_accounts_removed_message">在部分情况下，Play 商店的 DRM 可能会导致所有 DAVdroid 账户在设备重启或升级 DAVdroid 后消失。如果你遇到了该问题（并且只有这一问题），请从 Play 商店安装“DAVdroid JB Workaround”。</string>
   <string name="startup_google_play_accounts_removed_more_info">更多信息</string>
   <string name="startup_opentasks_not_installed">OpenTasks 未安装</string>
+  <string name="startup_opentasks_not_installed_message">未安装 OpenTasks 应用，故 DAVdroid 无法同步任务列表。</string>
+  <string name="startup_opentasks_reinstall_davdroid">安装 OpenTasks 后，由于 Android 的限制，请重新安装 DAVdroid 并重新创建账户。</string>
   <string name="startup_opentasks_not_installed_install">安装 OpenTasks</string>
   <!--AboutActivity-->
   <string name="about_license_terms">许可协议</string>
@@ -75,6 +77,16 @@
   <string name="account_refresh_calendar_list">刷新日历列表</string>
   <string name="account_create_new_calendar">创建日历</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid 权限</string>
+  <string name="permissions_calendar">日历权限</string>
+  <string name="permissions_calendar_details">要把 CalDAV 事件与本地日历同步，DAVdroid 需要日历权限。</string>
+  <string name="permissions_calendar_request">请求日历权限</string>
+  <string name="permissions_contacts">通讯录权限</string>
+  <string name="permissions_contacts_details">要把 CardDAV 通讯录与本地通讯录同步，DAVdroid 需要通讯录权限。</string>
+  <string name="permissions_contacts_request">请求通讯录权限</string>
+  <string name="permissions_opentasks">OpenTasks 权限</string>
+  <string name="permissions_opentasks_details">要把 CalDAV 任务与本地任务列表同步，DAVdroid 需要访问 OpenTasks。</string>
+  <string name="permissions_opentasks_request">请求 OpenTasks 权限</string>
   <!--AddAccountActivity-->
   <string name="login_title">增加账户</string>
   <string name="login_type_email">使用邮箱地址登录</string>
@@ -138,12 +150,23 @@
     <item>每 4 小时</item>
     <item>每 24 小时</item>
   </string-array>
+  <string name="settings_sync_wifi_only">只在 WiFi 下同步</string>
+  <string name="settings_sync_wifi_only_on">同步只在 WiFi 连接下进行</string>
+  <string name="settings_sync_wifi_only_off">同步不受数据连接类型限制</string>
+  <string name="settings_sync_wifi_only_ssid">WiFi SSID 限制</string>
+  <string name="settings_sync_wifi_only_ssid_on">同步只在 %s 网络下进行</string>
+  <string name="settings_sync_wifi_only_ssid_off">任何 WiFi 网络下均会同步</string>
+  <string name="settings_sync_wifi_only_ssid_message">输入 WiFi 网络的名称 (SSID) ，即可限制同步只在此网络下进行。留空则不限制。</string>
+  <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">旧日程时间限制</string>
   <string name="settings_sync_time_range_past_none">同步所有日程</string>
   <plurals name="settings_sync_time_range_past_days">
     <item quantity="other">%d 天前的日程不会被同步</item>
   </plurals>
   <string name="settings_sync_time_range_past_message">超过这个数字的天数的旧日程将会被忽略（可以为 0）。留空则同步所有日程。</string>
+  <string name="settings_manage_calendar_colors">管理日历颜色</string>
+  <string name="settings_manage_calendar_colors_on">日历颜色由 DAVdroid 设置</string>
+  <string name="settings_manage_calendar_colors_off">日历颜色不由 DAVdroid 设置</string>
   <string name="settings_version_update">DAVdroid 版本升级</string>
   <string name="settings_version_update_settings_updated">应用设置已更新。</string>
   <string name="settings_version_update_install_hint">出现问题了？请卸载 DAVdroid，再重新安装。</string>
@@ -175,6 +198,8 @@
   <string name="exception_show_details">显示详情</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">调试信息</string>
+  <string name="sync_error_permissions">DAVdroid 权限</string>
+  <string name="sync_error_permissions_text">需要额外权限</string>
   <string name="sync_error_calendar">日历同步失败（%s）</string>
   <string name="sync_error_contacts">通讯录同步失败（%s）</string>
   <string name="sync_error_tasks">任务同步失败（%s）</string>
diff --git a/build.gradle b/build.gradle
index c97fe05a..6c288c99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,3 +24,5 @@ allprojects {
         }
     }
 }
+
+apply plugin: 'android-reporting'
\ No newline at end of file
diff --git a/doc/DAVdroid-Linuxwochen-2016.odp b/doc/DAVdroid-Linuxwochen-2016.odp
new file mode 100644
index 00000000..129f0300
Binary files /dev/null and b/doc/DAVdroid-Linuxwochen-2016.odp differ
diff --git a/ical4android b/ical4android
index 4a80de4b..62405ba3 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit 4a80de4b62a43c6fd2d919ced0c12aca286c9056
+Subproject commit 62405ba390d1932bf634309bc14b967a419050fa
diff --git a/run-tests-connected.sh b/run-tests-connected.sh
new file mode 100755
index 00000000..6fd5b0ac
--- /dev/null
+++ b/run-tests-connected.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+./gradlew -i deviceCheck mergeAndroidReports --continue
diff --git a/vcard4android b/vcard4android
index 24aa1789..046cdbf7 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 24aa17891f88744d16d04d9f8b3f604bdf5632c3
+Subproject commit 046cdbf76911b2979c19e9219b069386d4b4cba7