diff --git a/app/build.gradle b/app/build.gradle
index 7819316a..a33f2456 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
 
-        versionCode 106
-        versionName "1.1.1.1"
+        versionCode 107
+        versionName "1.1.1.2"
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
     }
diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index 222e532c..50740031 100644
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@@ -1,12 +1,17 @@
 
 # ProGuard usage for DAVdroid:
-# 	shrinking		yes - main reason for using ProGuard
-# 	optimization		no - too risky
-# 	obfuscation		no - DAVdroid is open-source
-# 	preverification		no (Android default)
+# 	shrinking		yes (main reason for using ProGuard)
+# 	optimization		yes
+# 	obfuscation		no (DAVdroid is open-source)
+# 	preverification		no
 
 -dontobfuscate
 
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+-dontpreverify
+
 # ez-vcard
 -dontwarn ezvcard.io.json.**			# JSON serializer (for jCards) not used
 -dontwarn freemarker.**				# freemarker templating library (for creating hCards) not used
diff --git a/app/src/main/java/at/bitfire/davdroid/HttpClient.java b/app/src/main/java/at/bitfire/davdroid/HttpClient.java
index 5431f9ee..4c4dc9f7 100644
--- a/app/src/main/java/at/bitfire/davdroid/HttpClient.java
+++ b/app/src/main/java/at/bitfire/davdroid/HttpClient.java
@@ -90,7 +90,7 @@ public class HttpClient {
         builder.addNetworkInterceptor(userAgentInterceptor);
 
         // add cookie store for non-persistent cookies (some services like Horde use cookies for session tracking)
-        builder.cookieJar(MemoryCookieStore.INSTANCE);
+        builder.cookieJar(new MemoryCookieStore());
 
         // add network logging, if requested
         if (logger.isLoggable(Level.FINEST)) {
diff --git a/app/src/main/java/at/bitfire/davdroid/MemoryCookieStore.java b/app/src/main/java/at/bitfire/davdroid/MemoryCookieStore.java
index 0f97faeb..1b1cf330 100644
--- a/app/src/main/java/at/bitfire/davdroid/MemoryCookieStore.java
+++ b/app/src/main/java/at/bitfire/davdroid/MemoryCookieStore.java
@@ -26,8 +26,6 @@ import okhttp3.HttpUrl;
  */
 public class MemoryCookieStore implements CookieJar {
 
-    public static final MemoryCookieStore INSTANCE = new MemoryCookieStore();
-
     /**
      * Stored cookies. The multi-key consists of three parts: name, domain, and path.
      * This ensures that cookies can be overwritten. [RFC 6265 5.3 Storage Model]
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java
index 52600467..a0017798 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.java
@@ -96,7 +96,7 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie
                 startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("forums/").build()));
                 break;
             case R.id.nav_donate:
-                if (!App.FLAVOR_GOOGLE_PLAY.equals(BuildConfig.FLAVOR))
+                if (BuildConfig.FLAVOR != App.FLAVOR_GOOGLE_PLAY)
                     startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("donate/").build()));
                 break;
         }
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
index b134dcd2..aa7e4f2c 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
@@ -59,7 +59,7 @@ public class StartupDialogFragment extends DialogFragment {
             dialogs.add(StartupDialogFragment.instantiate(Mode.DEVELOPMENT_VERSION));
         else {
             // store-specific information
-            if (App.FLAVOR_GOOGLE_PLAY.equals(BuildConfig.FLAVOR)) {
+            if (BuildConfig.FLAVOR == App.FLAVOR_GOOGLE_PLAY) {
                 // Play store
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP &&    // only on Android <5
                     settings.getBoolean(HINT_GOOGLE_PLAY_ACCOUNTS_REMOVED, true))      // and only when "Don't show again" hasn't been clicked yet
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 181ccf0c..5ff23881 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -83,8 +83,11 @@
   <string name="permissions_calendar_details">For at synkronisere CalDAV-begivenheder med dine lokale kalendere, skal DAVdroid have adgang til dine kalendere.</string>
   <string name="permissions_calendar_request">Anmod om kalenderadgang</string>
   <string name="permissions_contacts">Kontakter: Adgangsrettigheder</string>
+  <string name="permissions_contacts_details">DAVdroid er nødt til at have adgang til dine kontakter, hvis CardDAV-adressebøger skal kunne synkronisere med dine kontakter.</string>
   <string name="permissions_contacts_request">Anmod om adgang til kontakter</string>
   <string name="permissions_opentasks">OpenTasks: Adgangsrettigheder</string>
+  <string name="permissions_opentasks_details">DAVdroid er nødt til at have adgang til OpenTasks, hvis CalDAV-opgaver skal kunne synkronisere med dine lokale opgavelister.</string>
+  <string name="permissions_opentasks_request">Anmod om adgang til OpenTasks</string>
   <!--AddAccountActivity-->
   <string name="login_title">Tilføj konto</string>
   <string name="login_type_email">Log ind med emailadresse</string>
@@ -104,6 +107,7 @@
   <string name="login_create_account">Opret konto</string>
   <string name="login_account_name">Kontonavn</string>
   <string name="login_account_name_info">Brug emailadressen som kontonavn, for Android vil bruge kontonavnet til ORGANIZER-feltet for aktiviteter, som du opretter. Du kan ikke have to konti med samme navn.</string>
+  <string name="login_account_contact_group_method">Gruppering af kontakter:</string>
   <string name="login_account_name_required">Kontonavn påkrævet</string>
   <string name="login_account_not_created">Konto kunne ikke oprettes</string>
   <string name="login_configuration_detection">Check konfiguration</string>
@@ -150,9 +154,24 @@
   </string-array>
   <string name="settings_sync_wifi_only">Synkroniser kun over WiFi</string>
   <string name="settings_sync_wifi_only_on">Synkronisering er begrænset til WiFi-forbindelser</string>
+  <string name="settings_sync_wifi_only_off">Forbindelsestypen har ingen betydning</string>
   <string name="settings_sync_wifi_only_ssid">Begræsning til WiFi-SSID</string>
   <string name="settings_sync_wifi_only_ssid_on">Vil kun blive synkroniseret over %s</string>
   <string name="settings_sync_wifi_only_ssid_off">Alle WiFi-forbindelse vil kunne bruges</string>
+  <string name="settings_sync_wifi_only_ssid_message">Indtast navnet på et WiFi-netværk (SSID) for at begrænse synkronisering til dette netværk, eller efterlad feltet blank for at acceptere alle WiFi-forbindelser.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">Gruppering af kontakter</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>Grupper er særskilte VCards</item>
+    <item>Grupper er kategorier pr. kontakt</item>
+  </string-array>
+  <string name="settings_rfc6868_for_vcards">Anvend RFC6868 for VCards</string>
+  <string name="settings_rfc6868_for_vcards_on">Dobbelte citationstegn kan bruges til at sætte parametre</string>
+  <string name="settings_rfc6868_for_vcards_off">Dobbelte citationstegn kan ikke bruges til at sætte parametre</string>
   <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">Tidsafgrænsning for tidligere begivenheder</string>
   <string name="settings_sync_time_range_past_none">Alle begivenheder vil blive synkroniseret</string>
@@ -162,6 +181,8 @@
   </plurals>
   <string name="settings_sync_time_range_past_message">Begivenheder, som er mere end dette antal dage gamle vil blive ignoreret (kan også være 0). Hvis feltet ikke er udfyldt, vil alle begivenheder blive synkroniseret.</string>
   <string name="settings_manage_calendar_colors">Administrer farver for kalender</string>
+  <string name="settings_manage_calendar_colors_on">Kalenderfarver administreres af DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Kalenderfarver sættes ikke fra DAVdroid</string>
   <string name="settings_version_update">Versionsopdatering af DAVdroid</string>
   <string name="settings_version_update_settings_updated">Interne indstillinger er blevet opdateret.</string>
   <string name="settings_version_update_install_hint">Problemer? Afinstaller DAVdroid og geninstaller.</string>
@@ -193,11 +214,27 @@
   <string name="exception_show_details">Vis detaljer</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">Debug-info</string>
+  <string name="sync_error_permissions">DAVdroid-rettigheder</string>
+  <string name="sync_error_permissions_text">Yderligere adgang påkrævet</string>
   <string name="sync_error_calendar">Synkronisering af kalenderen lykkedes ikke (%s)</string>
   <string name="sync_error_contacts">Synkronisering af adressebogen lykkedes ikke (%s)</string>
   <string name="sync_error_tasks">Synkronisering af opgaver lykkedes ikke (%s)</string>
   <string name="sync_error">Fejl under %s</string>
   <string name="sync_error_http_dav">Serverfejl under %s</string>
   <string name="sync_error_local_storage">Databasefejl under %s</string>
+  <string-array name="sync_error_phases">
+    <item>forbereder synkronisering</item>
+    <item>checker understøttelse</item>
+    <item>behandler poster, der er slettet lokalt</item>
+    <item>behandler poster, der er blevet oprettet/redigeret</item>
+    <item>uploader poster, der er blevet oprettet/redigeret</item>
+    <item>checker synkroniseringsstatus</item>
+    <item>laver liste af lokale poster</item>
+    <item>laver lister af poster på server</item>
+    <item>sammenligner poster lokalt og på server</item>
+    <item>downloader poster på server</item>
+    <item>efterbehandler</item>
+    <item>gemmer synkroniseringsstatus</item>
+  </string-array>
   <string name="sync_error_unauthorized">Fejl i brugernavn/adgangskode</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 27ca1444..45c92729 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -106,6 +106,7 @@
   <string name="login_create_account">创建账户</string>
   <string name="login_account_name">账户显示名</string>
   <string name="login_account_name_info">请使用你的邮箱地址作为帐户名，因为 Android 会将你创建的日历事件的创建者项设置为帐户名。你不能拥有多个帐户名相同的账户。</string>
+  <string name="login_account_contact_group_method">联系人分组方式</string>
   <string name="login_account_name_required">请输入账户名</string>
   <string name="login_account_not_created">账户无法创建</string>
   <string name="login_configuration_detection">正在配置</string>
@@ -157,6 +158,19 @@
   <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_carddav">CardDAV</string>
+  <string name="settings_contact_group_method">联系人分组方式</string>
+  <string-array name="settings_contact_group_method_values">
+    <item>GROUP_VCARDS</item>
+    <item>CATEGORIES</item>
+  </string-array>
+  <string-array name="settings_contact_group_method_entries">
+    <item>分为不同的 VCards</item>
+    <item>每个联系人的分类</item>
+  </string-array>
+  <string name="settings_rfc6868_for_vcards">为 VCards 启用 RFC6868</string>
+  <string name="settings_rfc6868_for_vcards_on">属性值中可使用双引号</string>
+  <string name="settings_rfc6868_for_vcards_off">属性值中不可使用双引号</string>
   <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">旧日程时间限制</string>
   <string name="settings_sync_time_range_past_none">同步所有日程</string>
@@ -206,5 +220,19 @@
   <string name="sync_error">%s时错误</string>
   <string name="sync_error_http_dav">%s时服务器错误</string>
   <string name="sync_error_local_storage">%s时数据库错误</string>
+  <string-array name="sync_error_phases">
+    <item>准备同步</item>
+    <item>请求功能列表</item>
+    <item>处理本地删除项目</item>
+    <item>准备创建/修改项目</item>
+    <item>上传创建/修改项目</item>
+    <item>检查同步状态</item>
+    <item>检查本地数据</item>
+    <item>检查远程数据</item>
+    <item>比较本地和远程数据</item>
+    <item>下载远程数据</item>
+    <item>预处理</item>
+    <item>保存同步状态</item>
+  </string-array>
   <string name="sync_error_unauthorized">用户名或密码错误</string>
 </resources>