From ad8c8328193bb7d842a2ec66fd8b5a580a724c59 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Sun, 19 Jun 2016 19:04:29 +0200
Subject: [PATCH] Version bump to 1.1

* fetch translations from Transifex
* fix account settings version update routine
---
 app/build.gradle                              |  4 +--
 .../at/bitfire/davdroid/AccountSettings.java  |  5 +--
 app/src/main/res/values-cs/strings.xml        |  4 +++
 app/src/main/res/values-de/strings.xml        | 15 ++++++--
 app/src/main/res/values-hu/strings.xml        |  3 ++
 app/src/main/res/values-ja/strings.xml        |  3 ++
 app/src/main/res/values-pl/strings.xml        | 34 +++++++++++++++++++
 app/src/main/res/values-pt-rBR/strings.xml    | 15 ++++----
 app/src/main/res/values-sr/strings.xml        |  3 ++
 9 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cae62eca..5cb013e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
 
-        versionCode 102
-        versionName "1.0.9.2"
+        versionCode 103
+        versionName "1.1"
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
     }
diff --git a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java b/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
index a4356f7b..2e5df515 100644
--- a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
+++ b/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
@@ -255,6 +255,7 @@ public class AccountSettings {
             try {
                 Method updateProc = getClass().getDeclaredMethod("update_" + fromVersion + "_" + toVersion);
                 updateProc.invoke(this);
+                accountManager.setUserData(account, KEY_SETTINGS_VERSION, String.valueOf(toVersion));
             } catch (Exception e) {
                 App.log.log(Level.SEVERE, "Couldn't update account settings", e);
             }
@@ -291,8 +292,6 @@ public class AccountSettings {
         if (!TextUtils.isEmpty(cTag))
             addr.setCTag(cTag);
         accountManager.setUserData(account, "addressbook_ctag", null);
-
-        accountManager.setUserData(account, KEY_SETTINGS_VERSION, "2");
     }
 
     @SuppressWarnings({ "Recycle", "unused" })
@@ -418,8 +417,6 @@ public class AccountSettings {
             refresh.putExtra(DavService.EXTRA_DAV_SERVICE_ID, serviceCalDAV);
             context.startService(refresh);
         }
-
-        accountManager.setUserData(account, KEY_SETTINGS_VERSION, "3");
     }
 
     @SuppressWarnings({ "Recycle", "unused" })
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e3e683f5..17ba7bb9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -159,6 +159,10 @@
   <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_carddav">CardDAV</string>
+  <string name="settings_rfc6868_for_vcards">Použít RFC6868 pro VCard</string>
+  <string name="settings_rfc6868_for_vcards_on">Uvozovky lze použít v hodnotách parametrů</string>
+  <string name="settings_rfc6868_for_vcards_off">Uvozovky nelze použít v hodnotách parametrů</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>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2a8c0b82..b2f135c2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -107,6 +107,7 @@
   <string name="login_create_account">Konto anlegen</string>
   <string name="login_account_name">Kontoname</string>
   <string name="login_account_name_info">Verwenden Sie Ihre Email-Adresse als Kontonamen, da Android den Kontonamen als ORGANIZER einsetzt. Es kann allerdings keine zwei Konten mit dem gleichen Namen geben.</string>
+  <string name="login_account_contact_group_method">Kontaktgruppen-Methode:</string>
   <string name="login_account_name_required">Kontoname wird benötigt</string>
   <string name="login_account_not_created">Konto konnte nicht angelegt werden</string>
   <string name="login_configuration_detection">Ressourcen-Erkennung</string>
@@ -159,9 +160,18 @@
   <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_contact_group_method">Kontaktgruppen-Methode</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>Gruppen sind eigene VCards</item>
+    <item>Gruppen sind Kategorien der Kontakte</item>
+  </string-array>
   <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_rfc6868_for_vcards_off">Anführungszeichen können nicht in Parameter-Werten 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>
@@ -214,7 +224,7 @@
   <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 Serverr-Fähigkeiten</item>
+    <item>Abfragen der Server-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>
@@ -223,6 +233,7 @@
     <item>Auflisten der Server-Einträge</item>
     <item>Vergleich lokaler/Server-Einträge</item>
     <item>Herunterladen von Server-Einträgen</item>
+    <item>Nachverarbeitung</item>
     <item>Speichern des Synchronisierungzustands</item>
   </string-array>
   <string name="sync_error_unauthorized">Benutzername/Passwort falsch</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index b0f16e91..d1b9f56a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -159,6 +159,9 @@
   <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_rfc6868_for_vcards">RFC6868 szabványnak megfelelő VCards használata</string>
+  <string name="settings_rfc6868_for_vcards_on">A paraméterértékek tartalmazhatnak idézőjelet</string>
+  <string name="settings_rfc6868_for_vcards_off">A paraméterértékek nem tartalmazhatnak idézőjelet</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>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7b90381a..45c542f8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -158,6 +158,9 @@
   <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_rfc6868_for_vcards">RFC6868 の VCards を使用する</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>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d4ece492..6612addb 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -13,23 +13,54 @@
   <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">Informacje o błędzie DRM Sklepu Play</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_message">Aplikacja Open Tasks nie jest dostępna, więc DAVdroid nie będzie mógł synchronizować listy zadań. </string>
+  <string name="startup_opentasks_reinstall_davdroid">Po zainstalowaniu OpenTasks konieczne jest PRZEINSTALOWANIE DAVdroid i ponowne dodanie twoich kont (błąd Androida).</string>
   <string name="startup_opentasks_not_installed_install">Zainstaluj OpenTasks</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">Warunki licencji</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">Plik logów DAVdroid</string>
+  <string name="logging_to_external_storage">Logowanie do zewnątrznej pamięci: %s</string>
+  <string name="logging_to_external_storage_warning">Usuń logi tak szybko jak to możliwe!</string>
+  <string name="logging_couldnt_create_file">Nie można stworzyć zewnętrznego pliku logów: %s</string>
+  <string name="logging_no_external_storage">Zewnętrzna pamięci nie została naleziona</string>
   <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Otwórz menu nawigacji</string>
+  <string name="navigation_drawer_close">Zamknij menu nawigacji</string>
+  <string name="navigation_drawer_subtitle">Adapter synchronizacji CalDAV/CardDAV</string>
   <string name="navigation_drawer_settings">Ustawienia</string>
+  <string name="navigation_drawer_news_updates">Nowości &amp; aktualizacje
+</string>
+  <string name="navigation_drawer_external_links">Zewnętrzne odnośniki</string>
+  <string name="navigation_drawer_website">Strona WWW</string>
   <string name="navigation_drawer_faq">FQA</string>
+  <string name="navigation_drawer_forums">Społeczność</string>
+  <string name="navigation_drawer_donate">Dotacja</string>
   <!--DavService-->
   <!--AppSettingsActivity-->
   <string name="app_settings">Ustawienia</string>
+  <string name="app_settings_user_interface">
+Interfejs użytkownika</string>
+  <string name="app_settings_reset_hints">Zresetuj podpowiedzi</string>
+  <string name="app_settings_security">Bezpieczeństwo</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-->
+  <string name="account_synchronize_now">Synchronizuj teraz</string>
+  <string name="account_synchronizing_now">Synchronizcja w toku</string>
+  <string name="account_settings">Ustawienia konta</string>
+  <string name="account_delete">Usuń konto</string>
+  <string name="account_delete_confirmation_title">Naprawdę chcesz usunąć konto?</string>
+  <string name="account_create_new_calendar">Stwórz nowy kalendarz</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">Uprawnienia DAVdroid</string>
+  <string name="permissions_calendar">Uprawnienia kalendarza</string>
+  <string name="permissions_contacts">Uprawnienia kontaktów</string>
+  <string name="permissions_opentasks">Uprawnienia OpenTasks</string>
   <!--AddAccountActivity-->
   <string name="login_title">Dodaj konto</string>
   <string name="login_type_email">Logowanie za pomocą adresu e-mail</string>
@@ -38,6 +69,9 @@
   <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_login">Zaloguj</string>
+  <string name="login_back">Wróć</string>
+  <string name="login_create_account">Stwórz konto</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>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c66b7c8b..68eb7187 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -12,7 +12,7 @@
   <string name="startup_development_version_message">Esta é uma versão de desenvolvimento do DAVdroid. Lembre-se de que as coisas podem não funcionar como esperado. Por favor, envie sugestões e comentários construtivos para melhorar o DAVdroid.</string>
   <string name="startup_development_version_give_feedback">Enviar sugestões</string>
   <string name="startup_donate">Informação sobre Código Aberto</string>
-  <string name="startup_donate_message">Estamos felizes que você usa o DAVdroid, que é um software de código aberto (GPLv3). O desenvolvimento do DAVdroid é trabalhoso e consome muitas horas de trabalho. Por esse motivo, considere fazer uma doação.</string>
+  <string name="startup_donate_message">Estamos felizes que você usa o DAVdroid, um software de código aberto (GPLv3). O desenvolvimento do DAVdroid é trabalhoso e consome muitas horas de trabalho. Por esse motivo, considere fazer uma doação.</string>
   <string name="startup_donate_now">Mostrar a página de doações</string>
   <string name="startup_donate_later">Talvez depois</string>
   <string name="startup_google_play_accounts_removed">Informação sobre o erro de DRM da Play Store</string>
@@ -152,15 +152,18 @@
     <item>Uma vez por dia</item>
   </string-array>
   <string name="settings_sync_wifi_only">Sincronizar apenas por Wi-Fi</string>
-  <string name="settings_sync_wifi_only_on">A sincronização está restrita a conexões Wi-Fi</string>
+  <string name="settings_sync_wifi_only_on">Sincronização restrita a conexões Wi-Fi</string>
   <string name="settings_sync_wifi_only_off">O tipo de conexão não é considerado</string>
   <string name="settings_sync_wifi_only_ssid">Restrição de SSID Wi-Fi</string>
   <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_off">Qualquer conexão Wi-Fi pode ser utilizada</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_rfc6868_for_vcards">Usar RFC6868 para VCards</string>
+  <string name="settings_rfc6868_for_vcards_on">Aspas podem ser utilizadas nos valores dos parâmetros</string>
+  <string name="settings_rfc6868_for_vcards_off">Aspas não podem ser utilizadas nos valores dos parâmetros</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">Limite de tempo para eventos passados</string>
   <string name="settings_sync_time_range_past_none">Todos os eventos serão sincronizados</string>
   <plurals name="settings_sync_time_range_past_days">
     <item quantity="one">Os eventos que ocorreram a mais de um dia serão ignorados</item>
@@ -168,8 +171,8 @@
   </plurals>
   <string name="settings_sync_time_range_past_message">Os eventos que ocorreram antes desse número de dias serão ignorados (pode ser 0). Deixe em branco para sincronizar todos os eventos.</string>
   <string name="settings_manage_calendar_colors">Gerenciar cores dos calendários</string>
-  <string name="settings_manage_calendar_colors_on">As cores do calendários são gerenciadas pelo DAVdroid</string>
-  <string name="settings_manage_calendar_colors_off">As cores do calendários não são definidas pelo DAVdroid</string>
+  <string name="settings_manage_calendar_colors_on">Cores dos calendários definidas pelo DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Cores dos calendários não definidas pelo DAVdroid</string>
   <string name="settings_version_update">Atualização da versão do DAVdroid</string>
   <string name="settings_version_update_settings_updated">As configurações internas foram atualizadas.</string>
   <string name="settings_version_update_install_hint">Problemas? Desinstale o DAVdroid e instale novamente.</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index c7ecd28a..4745e7ad 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -160,6 +160,9 @@
   <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_rfc6868_for_vcards">Користи РФЦ6868 за В-карте</string>
+  <string name="settings_rfc6868_for_vcards_on">Двоструки наводници могу да се користе у вредностима параметара</string>
+  <string name="settings_rfc6868_for_vcards_off">Двоструки наводници не могу да се користе у вредностима параметара</string>
   <string name="settings_caldav">КалДАВ</string>
   <string name="settings_sync_time_range_past">Ограничење догађаја у прошлости</string>
   <string name="settings_sync_time_range_past_none">Сви догађаји се синхронизују</string>