From 34bc27fa79c8c14dc80700f074fed6f8aa605cfb Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Thu, 9 Jun 2016 10:13:47 +0200
Subject: [PATCH 1/3] Switch from preference-v7 to preference-v14 to make
 preferences look more Material (thanks biociahi!)

---
 app/build.gradle                   | 2 +-
 app/src/main/res/values/styles.xml | 7 +++++--
 dav4android                        | 2 +-
 ical4android                       | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0b141281..91099732 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.+'
     compile 'com.android.support:cardview-v7:23.+'
     compile 'com.android.support:design:23.+'
-    compile 'com.android.support:preference-v7:23.+'
+    compile 'com.android.support:preference-v14:23.+'
 
     compile 'com.github.yukuku:ambilwarna:2.0.1'
     compile project(':MemorizingTrustManager')
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fab433ad..89e97956 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,6 +23,9 @@
     <color name="very_light_grey">#ebebeb</color>
     <color name="white">#ffffff</color>
 
+    <!-- preference-v14 uses this color for categories text -->
+    <color name="preference_fallback_accent_color">@color/orangeA700</color>
+
 
     <!-- app theme -->
 
@@ -33,7 +36,7 @@
         <item name="colorAccent">@color/orangeA700</item>
         <item name="android:textColorPrimary">@drawable/text_color</item>
         <item name="android:textColorSecondary">@color/grey</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -101,4 +104,4 @@
         <item name="android:textColor">@color/orangeA700</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/dav4android b/dav4android
index 871d62ff..fde96be2 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 871d62fffc45cbe5aa061b4ed2b3bd5282a64dd1
+Subproject commit fde96be29889d29f6ee796cf40f120fba6d50690
diff --git a/ical4android b/ical4android
index baffbc62..ee884d35 160000
--- a/ical4android
+++ b/ical4android
@@ -1 +1 @@
-Subproject commit baffbc628b9ca9733c1b97671d6ae8854cd06391
+Subproject commit ee884d351b590e2f148561b17814db6d0d9e2a69

From 317144630cacd1977909b62b304aed446a44b914 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Sat, 11 Jun 2016 08:53:29 +0200
Subject: [PATCH 2/3] Make use of RFC6868 optional

* make use of RFC6868 for VCards optional because some defect servers don't accept it
* minor UI improvements (thanks biociahi)
---
 .../at/bitfire/davdroid/AccountSettings.java    | 17 +++++++++++++++++
 .../syncadapter/ContactsSyncManager.java        |  2 +-
 .../davdroid/ui/AccountSettingsActivity.java    | 13 ++++++++++++-
 app/src/main/res/layout/accounts_content.xml    |  1 -
 app/src/main/res/layout/activity_accounts.xml   |  6 ++----
 app/src/main/res/values/strings.xml             |  4 ++++
 app/src/main/res/xml/settings_account.xml       | 13 ++++++++++++-
 vcard4android                                   |  2 +-
 8 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java b/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
index 0ea7ccfc..f497b06b 100644
--- a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
+++ b/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
@@ -59,6 +59,12 @@ public class AccountSettings {
             KEY_WIFI_ONLY = "wifi_only",            // sync on WiFi only (default: false)
             KEY_WIFI_ONLY_SSID = "wifi_only_ssid";  // restrict sync to specific WiFi SSID
 
+    /** Whether to use RFC 6868 for VCards
+     *  value = null (not existing)      use RFC6868-style encoding (default value)
+     *          "0"                      don't use RFC 6868-style encoding
+     */
+    private final static String KEY_VCARD_RFC6868 = "vcard_rfc6868";
+
     /** Time range limitation to the past [in days]
         value = null            default value (DEFAULT_TIME_RANGE_PAST_DAYS)
               < 0 (-1)          no limit
@@ -182,6 +188,17 @@ public class AccountSettings {
     }
 
 
+    // CardDAV settings
+
+    public boolean getVCardRFC6868() {
+        return accountManager.getUserData(account, KEY_VCARD_RFC6868) == null;
+    }
+
+    public void setVCardRFC6868(boolean use) {
+        accountManager.setUserData(account, KEY_VCARD_RFC6868, use ? null : "0");
+    }
+
+
     // CalDAV settings
 
     public Integer getTimeRangePastDays() {
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
index 7ce1306b..cbdeb9e9 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
@@ -137,7 +137,7 @@ public class ContactsSyncManager extends SyncManager {
         App.log.log(Level.FINE, "Preparing upload of contact " + local.getFileName(), local.getContact());
 
         ByteArrayOutputStream os = new ByteArrayOutputStream();
-        local.getContact().write(hasVCard4 ? VCardVersion.V4_0 : VCardVersion.V3_0, os);
+        local.getContact().write(hasVCard4 ? VCardVersion.V4_0 : VCardVersion.V3_0, settings.getVCardRFC6868(), os);
 
         return RequestBody.create(
                 hasVCard4 ? DavAddressBook.MIME_VCARD4 : DavAddressBook.MIME_VCARD3_UTF8,
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java
index 52169013..895a065c 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java
@@ -208,8 +208,19 @@ public class AccountSettingsActivity extends AppCompatActivity {
                 }
             });
 
+            // category: CardDAV
+            final SwitchPreferenceCompat prefRFC6868 = (SwitchPreferenceCompat)findPreference("vcard_rfc6868");
+            prefRFC6868.setChecked(settings.getVCardRFC6868());
+            prefRFC6868.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object o) {
+                    settings.setVCardRFC6868((Boolean)o);
+                    refresh(); return false;
+                }
+            });
+
             // category: CalDAV
-            final EditTextPreference prefTimeRangePastDays = (EditTextPreference)findPreference("caldav_time_range_past_days");
+            final EditTextPreference prefTimeRangePastDays = (EditTextPreference)findPreference("time_range_past_days");
             Integer pastDays =  settings.getTimeRangePastDays();
             if (pastDays != null) {
                 prefTimeRangePastDays.setText(pastDays.toString());
diff --git a/app/src/main/res/layout/accounts_content.xml b/app/src/main/res/layout/accounts_content.xml
index e1e5230c..f8e5c9b6 100644
--- a/app/src/main/res/layout/accounts_content.xml
+++ b/app/src/main/res/layout/accounts_content.xml
@@ -13,7 +13,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context="at.bitfire.davdroid.ui.AccountsActivity">
 
     <android.support.design.widget.AppBarLayout
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index e195ae59..f909cd84 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -14,12 +14,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:openDrawer="start">
 
-    <include
-        layout="@layout/accounts_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+    <include layout="@layout/accounts_content"/>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/nav_view"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 939d464e..4b2bbaeb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -179,6 +179,10 @@
     <string name="settings_sync_wifi_only_ssid_on">Will only synchronize over %s</string>
     <string name="settings_sync_wifi_only_ssid_off">All WiFi connections may be used</string>
     <string name="settings_sync_wifi_only_ssid_message">Enter the name of a WiFi network (SSID) to restrict synchronization to this network, or leave blank for all WiFi connections.</string>
+    <string name="settings_carddav">CardDAV</string>
+    <string name="settings_rfc6868_for_vcards">Use RFC6868 for VCards</string>
+    <string name="settings_rfc6868_for_vcards_on">Double quotes can be used in parameter values</string>
+    <string name="settings_rfc6868_for_vcards_off">Double quotes can\'t be used in parameter values</string>
     <string name="settings_caldav">CalDAV</string>
     <string name="settings_sync_time_range_past">Past event time limit</string>
     <string name="settings_sync_time_range_past_none">All events will be synchronized</string>
diff --git a/app/src/main/res/xml/settings_account.xml b/app/src/main/res/xml/settings_account.xml
index 87cfb3a1..13b69834 100644
--- a/app/src/main/res/xml/settings_account.xml
+++ b/app/src/main/res/xml/settings_account.xml
@@ -74,10 +74,21 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/settings_carddav">
+
+        <SwitchPreferenceCompat
+            android:key="vcard_rfc6868"
+            android:persistent="false"
+            android:title="@string/settings_rfc6868_for_vcards"
+            android:summaryOn="@string/settings_rfc6868_for_vcards_on"
+            android:summaryOff="@string/settings_rfc6868_for_vcards_off"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/settings_caldav">
 
         <EditTextPreference
-            android:key="caldav_time_range_past_days"
+            android:key="time_range_past_days"
             android:persistent="false"
             android:title="@string/settings_sync_time_range_past"
             android:dialogMessage="@string/settings_sync_time_range_past_message"
diff --git a/vcard4android b/vcard4android
index 33cc8fbf..2ba66e64 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 33cc8fbf59a114dbcaadfa3cc0fbba5fa01589d2
+Subproject commit 2ba66e6498ee8fdb37b13f4ffec94311e1c50c99

From c7c13520f9124c6c453718f0a5ee64409c855bfe Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Sat, 11 Jun 2016 09:06:21 +0200
Subject: [PATCH 3/3] Version bump to 1.0.9.2

* version bump to 1.0.9.2
* fetch translations from Transifex
---
 app/build.gradle                           |  4 +--
 app/src/main/res/values-cs/strings.xml     | 13 -------
 app/src/main/res/values-da/strings.xml     | 13 -------
 app/src/main/res/values-de/strings.xml     | 10 ++++--
 app/src/main/res/values-es/strings.xml     | 13 -------
 app/src/main/res/values-fr/strings.xml     | 13 -------
 app/src/main/res/values-hu/strings.xml     | 14 +-------
 app/src/main/res/values-ja/strings.xml     | 14 +-------
 app/src/main/res/values-nl/strings.xml     | 13 -------
 app/src/main/res/values-pl/strings.xml     | 41 +++++++++++++++-------
 app/src/main/res/values-pt-rBR/strings.xml | 14 +-------
 app/src/main/res/values-sr/strings.xml     | 14 +-------
 app/src/main/res/values-tr-rTR/strings.xml | 13 -------
 app/src/main/res/values-zh-rCN/strings.xml | 13 -------
 14 files changed, 41 insertions(+), 161 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 91099732..cae62eca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
 
-        versionCode 101
-        versionName "1.0.9.1"
+        versionCode 102
+        versionName "1.0.9.2"
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
     }
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 88157b45..e3e683f5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -210,18 +210,5 @@
   <string name="sync_error">Chyba při %s</string>
   <string name="sync_error_http_dav">Chyba serveru při %s</string>
   <string name="sync_error_local_storage">Chyba databáze při %s</string>
-  <string-array name="sync_error_phases">
-    <item>příprava synchronizace</item>
-    <item>dotazování možností</item>
-    <item>zpracovávání místních smazaných záznamů</item>
-    <item>příprava vytvořených/upravených záznamů</item>
-    <item>nahrávání vytvořených/upravených záznamů</item>
-    <item>kontrola stavu synchronizace</item>
-    <item>výpis místních záznamů</item>
-    <item>výpis vzdálených záznamů</item>
-    <item>porovnání místních/vzdálených záznamů</item>
-    <item>stahování vzdálených záznamů</item>
-    <item>ukládání stavu synchronizace</item>
-  </string-array>
   <string name="sync_error_unauthorized">Chybné uživatelské jméno/heslo</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 65a04176..181ccf0c 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -199,18 +199,5 @@
   <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 funktioner</item>
-    <item>behandler poster, der er slettet lokalt</item>
-    <item>behandler poster, der er oprettet/ændret lokalt</item>
-    <item>uploader poster, der er oprettet/ændret lokalt</item>
-    <item>checker synkroniseringsstatus</item>
-    <item>oplister lokale poster</item>
-    <item>oplister poster på server</item>
-    <item>sammenligner poster lokalt og på server</item>
-    <item>downloader poster på server</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-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2fefe491..2a8c0b82 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -158,6 +158,10 @@
   <string name="settings_sync_wifi_only_ssid_on">Synchronisierung nur über %s</string>
   <string name="settings_sync_wifi_only_ssid_off">Alle WLAN-Verbindungen können verwendet werden</string>
   <string name="settings_sync_wifi_only_ssid_message">Name eines WLANs (SSID) eingeben, um Synchronisierung auf dieses WLAN zu beschränken. Leer lassen, um alle WLAN-Verbindungen zuzulassen.</string>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_rfc6868_for_vcards">RFC6868 für VCards verwenden</string>
+  <string name="settings_rfc6868_for_vcards_on">Anführungszeichen können in Parameter-Werten verwendet werden</string>
+  <string name="settings_rfc6868_for_vcards_off">Anführungszeichen können in Parameter-Werten nicht verwendet werden</string>
   <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">Abrufbeschränkung vergangener Termine</string>
   <string name="settings_sync_time_range_past_none">Alle Termine werden synchronisiert</string>
@@ -210,16 +214,16 @@
   <string name="sync_error_local_storage">Datenbank-Fehler beim %s</string>
   <string-array name="sync_error_phases">
     <item>Vorbereiten der Synchronisierung</item>
-    <item>Abfragen der Server-Fähigkeiten</item>
+    <item>Abfragen der Serverr-Fähigkeiten</item>
     <item>Verarbeiten lokal gelöschter Einträge</item>
     <item>Vorbereiten neuer/geänderter Einträge</item>
     <item>Hochladen neuer/geänderter Einträge</item>
     <item>Abfragen des Synchronisierungs-Zustands</item>
     <item>Auflisten lokaler Einträge</item>
     <item>Auflisten der Server-Einträge</item>
-    <item>Vergleichen tw. Datenbank/Server</item>
+    <item>Vergleich lokaler/Server-Einträge</item>
     <item>Herunterladen von Server-Einträgen</item>
-    <item>Speichern des Synchronisierungs-Zustands</item>
+    <item>Speichern des Synchronisierungzustands</item>
   </string-array>
   <string name="sync_error_unauthorized">Benutzername/Passwort falsch</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8954b7e4..7b82cda5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -207,18 +207,5 @@
   <string name="sync_error">Error al %s</string>
   <string name="sync_error_http_dav">Error de servidor al %s</string>
   <string name="sync_error_local_storage">Error de base de datos al %s</string>
-  <string-array name="sync_error_phases">
-    <item>preparar sincronización</item>
-    <item>consultar capacidades</item>
-    <item>procesar entradas borradas localmente</item>
-    <item>preparar entradas creadas/modificadas</item>
-    <item>cargar entradas creadas/modificadas</item>
-    <item>comprobar estado de sincronización</item>
-    <item>listar entradas locales</item>
-    <item>listar entradas remotas</item>
-    <item>comparar entradas locaesl/remotas</item>
-    <item>descargar entradas remotas</item>
-    <item>guardar estado de sincronización</item>
-  </string-array>
   <string name="sync_error_unauthorized">Nombre de usuario/contraseña erróneo</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3d926f77..240cb162 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -207,18 +207,5 @@
   <string name="sync_error">Erreur durant %s</string>
   <string name="sync_error_http_dav">Erreur de serveur durant %s</string>
   <string name="sync_error_local_storage">Erreur de base de donnée durant %s</string>
-  <string-array name="sync_error_phases">
-    <item>prépare la synchronisation</item>
-    <item>demande les autorisations</item>
-    <item>prépare la suppression des entrées locales</item>
-    <item>prépare les entrées créées/modifiées</item>
-    <item>envoi les entrées créées/modifiées</item>
-    <item>vérifie l\'état de la synchronisation</item>
-    <item>liste les entrées locales</item>
-    <item>liste les entrées distantes</item>
-    <item>compare les entrées locales/distantes</item>
-    <item>télécharge les entrées distantes</item>
-    <item>enregistre l\'état de la synchronisation</item>
-  </string-array>
   <string name="sync_error_unauthorized">Nom d\'utilisateur ou mot de passe erroné</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 494898e0..b0f16e91 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -158,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_carddav">CardDAV</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>
@@ -208,18 +209,5 @@
   <string name="sync_error">Hiba az alábbi művelet közben: %s</string>
   <string name="sync_error_http_dav">Szerver oldali hiba az alábbi művelet közben: %s</string>
   <string name="sync_error_local_storage">Adatbázishiba az alábbi művelet közben: %s</string>
-  <string-array name="sync_error_phases">
-    <item>felkészülés a szinkronizálásra</item>
-    <item>szolgáltatások keresése</item>
-    <item>a helyben törölt bejegyzések feldolgozása</item>
-    <item>az új vagy módosított bejegyzések összegyűjtése</item>
-    <item>az új vagy módosított bejegyzések feltöltése</item>
-    <item>a szinkronizációs állapot ellenőrzése</item>
-    <item>helyi bejegyzések listázása</item>
-    <item>távoli bejegyzések listázása</item>
-    <item>helyi és távoli bejegyzések összehasonlítása</item>
-    <item>távoli bejegyzések letöltése</item>
-    <item>szinkronizációs állapot mentése</item>
-  </string-array>
   <string name="sync_error_unauthorized">A felhasználónév vagy jelszó hibás</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2fd77328..7b90381a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -157,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_carddav">CardDAV</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,18 +207,5 @@
   <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>
-  </string-array>
   <string name="sync_error_unauthorized">ユーザー名/パスワードが間違っています</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c6e91105..da7f0346 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -208,18 +208,5 @@
   <string name="sync_error">Fout tijdens %s</string>
   <string name="sync_error_http_dav">Serverfout tijdens %s</string>
   <string name="sync_error_local_storage">Database fout tijdens %s</string>
-  <string-array name="sync_error_phases">
-    <item>synchronisatie voorbereiden</item>
-    <item>mogelijkheden opvragen</item>
-    <item>lokaal verwijderde entries verwrken</item>
-    <item>nieuwe/aangepaste entries verwerken</item>
-    <item>nieuwe/aangepaste entries uploaden</item>
-    <item>controleren van sync staat</item>
-    <item>vermelden lokale entries</item>
-    <item>vermelden server entries</item>
-    <item>vergelijken van lokale/server entries</item>
-    <item>downloaden server entries</item>
-    <item>opslaan van sync staat</item>
-  </string-array>
   <string name="sync_error_unauthorized">Gebruikersnaam/wachtwoord onjuist</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 31e9b56c..d4ece492 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -3,20 +3,46 @@
   <!--common strings-->
   <string name="app_name">DAVdroid</string>
   <string name="help">Pomoc</string>
+  <string name="manage_accounts">Zadządzaj kontami</string>
+  <string name="please_wait">Proszę czekać</string>
   <string name="send">Wyślij</string>
   <!--startup dialogs-->
+  <string name="startup_dont_show_again">Nie pokazuj ponownie</string>
+  <string name="startup_development_version">DAVdroid Preview Release</string>
+  <string name="startup_development_version_give_feedback">Przekaż opinię</string>
+  <string name="startup_donate">Informacje Open-Source</string>
+  <string name="startup_donate_now">Pokaż stronę darowizny</string>
+  <string name="startup_donate_later">Może później</string>
+  <string name="startup_google_play_accounts_removed_more_info">Więcej informacji</string>
+  <string name="startup_opentasks_not_installed">OpenTasks nie jest zainstalowany</string>
+  <string name="startup_opentasks_not_installed_install">Zainstaluj OpenTasks</string>
   <!--AboutActivity-->
   <!--global settings-->
+  <string name="logging_davdroid_file_logging">Plik logów DAVdroid</string>
   <!--AccountsActivity-->
+  <string name="navigation_drawer_settings">Ustawienia</string>
+  <string name="navigation_drawer_faq">FQA</string>
   <!--DavService-->
   <!--AppSettingsActivity-->
+  <string name="app_settings">Ustawienia</string>
+  <string name="app_settings_debug">Debugowanie</string>
+  <string name="app_settings_log_to_external_storage">Loguj to zewnętrznego pliku</string>
+  <string name="app_settings_show_debug_info">Pokaż informacje do debug\'owania</string>
   <!--AccountActivity-->
   <!--PermissionsActivity-->
   <!--AddAccountActivity-->
+  <string name="login_title">Dodaj konto</string>
   <string name="login_type_email">Logowanie za pomocą adresu e-mail</string>
+  <string name="login_email_address">Adres e-mail</string>
+  <string name="login_password">Hasło</string>
   <string name="login_type_url">Logowanie za pomocą adresu URL i nazwy użytkownika</string>
+  <string name="login_user_name">Nazwa użytkownika</string>
   <string name="login_auth_preemptive">Autoryzacja prewencyjna (zalecana, ale niezgodna z autoryzacją Digest)</string>
+  <string name="login_account_name">Nazwa konta</string>
+  <string name="login_account_name_info">Użyj swojego adresu e-mail jako nazwy konta, ponieważ Android będzie używał nazwy konta jako pola ORGANIZATOR dla wydarzeń, które stworzysz. Nie możesz posiadać dwóch kont o takiej samej nazwie.</string>
+  <string name="login_view_logs">Pokaż logi</string>
   <!--AccountSettingsActivity-->
+  <string name="settings_title">Ustawienia: %s</string>
   <string name="settings_authentication">Uwierzytelnianie</string>
   <string name="settings_username">Nazwa użytkownika</string>
   <string name="settings_enter_username">Wpisz nazwe użytkownika:</string>
@@ -53,6 +79,8 @@
     <item>Co 4 godziny</item>
     <item>Raz dziennie</item>
   </string-array>
+  <string name="settings_carddav">CardDAV</string>
+  <string name="settings_caldav">CalDAV</string>
   <!--collection management-->
   <!--ExceptionInfoFragment-->
   <!--sync errors and DebugInfoActivity-->
@@ -63,18 +91,5 @@
   <string name="sync_error">Błąd podczas %s</string>
   <string name="sync_error_http_dav">Błąd servera podczas %s</string>
   <string name="sync_error_local_storage">Bład bazy danych podczas %s</string>
-  <string-array name="sync_error_phases">
-    <item>przygotowania synchronizacji</item>
-    <item>odpytywania o funkcje</item>
-    <item>przetwarzania lokalnie usuniętych wpisów</item>
-    <item>przygotowania stworzonych lub zmodyfikowanych wpisów</item>
-    <item>wysyłania stworzonych lub zmodyfikowanych wpisów</item>
-    <item>sprawdzania stanu synchronizacji</item>
-    <item>listowania lokalnych wpisów</item>
-    <item>listowania zdalnych wpisów</item>
-    <item>porównywania lokalnych lub zdalnych wpisów</item>
-    <item>pobierania zdalnych wpisów</item>
-    <item>zapisywania stanu synchronizacji</item>
-  </string-array>
   <string name="sync_error_unauthorized">Błędna nazwa użytkownika lub hasło</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a8c1c0e3..c66b7c8b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -158,6 +158,7 @@
   <string name="settings_sync_wifi_only_ssid_on">Sincronizará apenas com %s</string>
   <string name="settings_sync_wifi_only_ssid_off">Todas as conexões Wi-Fi podem ser utilizadas</string>
   <string name="settings_sync_wifi_only_ssid_message">Informe o nome da rede Wi-Fi (SSID) que será usada para sincronização ou deixe em branco para usar qualquer conexão Wi-Fi.</string>
+  <string name="settings_carddav">CardDAV</string>
   <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">Limite para eventos passados</string>
   <string name="settings_sync_time_range_past_none">Todos os eventos serão sincronizados</string>
@@ -208,18 +209,5 @@
   <string name="sync_error">Erro ao %s</string>
   <string name="sync_error_http_dav">Erro do servidor ao %s</string>
   <string name="sync_error_local_storage">Erro do banco de dados ao %s</string>
-  <string-array name="sync_error_phases">
-    <item>preparando sincronização</item>
-    <item>procurando capacidades</item>
-    <item>processando os itens excluídos localmente</item>
-    <item>preparando os itens criados/modificados</item>
-    <item>enviando os itens criados/modificados</item>
-    <item>verificando o estado da sincronização</item>
-    <item>listando os itens locais</item>
-    <item>listando os itens remotos</item>
-    <item>comparando os itens locais/remotos</item>
-    <item>baixando os itens remotos</item>
-    <item>salvando o estado da sincronização</item>
-  </string-array>
   <string name="sync_error_unauthorized">Usuário/senha incorreto</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 7bb4643d..c7ecd28a 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -159,6 +159,7 @@
   <string name="settings_sync_wifi_only_ssid_on">Синхронизовање само преко %s</string>
   <string name="settings_sync_wifi_only_ssid_off">Коришћење свих бежичних мрежа</string>
   <string name="settings_sync_wifi_only_ssid_message">Унесите назив бежичне мреже (њен ССИД) да бисте ограничили синхронизацију само на ту мрежу, или оставите празно за синхронизовање преко било које бежичне мреже.</string>
+  <string name="settings_carddav">КардДАВ</string>
   <string name="settings_caldav">КалДАВ</string>
   <string name="settings_sync_time_range_past">Ограничење догађаја у прошлости</string>
   <string name="settings_sync_time_range_past_none">Сви догађаји се синхронизују</string>
@@ -210,18 +211,5 @@
   <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>
-  </string-array>
   <string name="sync_error_unauthorized">Корисничко име или лозинка погрешни</string>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 15d26172..7cea0edf 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -208,18 +208,5 @@
   <string name="sync_error">%s yaparken hata</string>
   <string name="sync_error_http_dav">%s yaparken sunucu hatası</string>
   <string name="sync_error_local_storage">%s yaparken veritabanı hatası</string>
-  <string-array name="sync_error_phases">
-    <item>senkronizasyon hazırlanıyor</item>
-    <item>yetkinlikler sorgulanıyor</item>
-    <item>yerel olarak silinmiş kayıtlar işleniyor</item>
-    <item>yaratılmış/değiştirilmiş kayıtlar hazırlanıyor</item>
-    <item>yaratılmış/değiştirilmiş kayıtlar indiriliyor</item>
-    <item>senkronizasyon durumu kontrol ediliyor</item>
-    <item>yerel kayıtlar listeleniyor</item>
-    <item>uzak kayıtlar listeleniyor</item>
-    <item>yerel/uzak kayıtlar karşılaştırılıyor</item>
-    <item>uzak kayıtlar indiriliyor</item>
-    <item>senkronizasyon durumu kaydediliyor</item>
-  </string-array>
   <string name="sync_error_unauthorized">Kullanıcı adı/parola yanlış</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 2f97cd05..27ca1444 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -206,18 +206,5 @@
   <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>
-  </string-array>
   <string name="sync_error_unauthorized">用户名或密码错误</string>
 </resources>