From 879b137cfcf01e9630351a5e13d06f199b82c235 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Sun, 27 Mar 2016 15:55:05 +0200
Subject: [PATCH] Version bump to 1.0

* fetch translations from Transifex
---
 app/build.gradle                           |  4 ++--
 app/src/main/res/values-da/strings.xml     | 10 ++++++++++
 app/src/main/res/values-hu/strings.xml     | 10 ++++++++++
 app/src/main/res/values-ja/strings.xml     |  7 +++++++
 app/src/main/res/values-pt-rBR/strings.xml | 10 ++++++++++
 app/src/main/res/values-zh-rCN/strings.xml | 16 +++++++++++++---
 6 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 64841ec5..1edc002f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 22
 
-        versionCode 89
-        versionName "1.0-rc1"
+        versionCode 90
+        versionName "1.0"
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
     }
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index fb2c21ae..812d3106 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -22,6 +22,8 @@
   <string name="startup_opentasks_not_installed_message">OpenTasks-app\'en er ikke installeret eller kan ikke tilgås, så DAVdroid vil ikke være i stand til at opdatere opgavelister. Geninstaller DAVdroid og tilføj dine konti igen efter installation af OpenTasks.</string>
   <string name="startup_opentasks_not_installed_install">Installer OpenTasks</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">Licensforhold</string>
+  <string name="about_license_info_no_warranty">Dette program leveres ABSOLUT UDEN GARANTI. Det er fri software, og du er velkommen til at videredistribuere det under visse betingelse.</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">DAVdroid fil-logning</string>
   <string name="logging_to_external_storage">Logger til eksternt datalager: %s</string>
@@ -34,6 +36,7 @@
   <string name="navigation_drawer_subtitle">CalDAV/CardDAV Sync-adapter</string>
   <string name="navigation_drawer_about">Om / Licens</string>
   <string name="navigation_drawer_settings">Indstillinger</string>
+  <string name="navigation_drawer_news_updates">Nyheder &amp; opdateringer</string>
   <string name="navigation_drawer_external_links">Eksterne links</string>
   <string name="navigation_drawer_website">Hjemmeside</string>
   <string name="navigation_drawer_faq">FAQ</string>
@@ -41,6 +44,8 @@
   <string name="navigation_drawer_donate">Donation</string>
   <string name="account_list_empty">Velkommen til DAVdroid!\n\nDu kan nu tilføje en CaDAV/CardDAV-konto.</string>
   <!--DavService-->
+  <string name="dav_service_refresh_failed">Registrering af tjeneste kunne ikke foretages</string>
+  <string name="dav_service_refresh_couldnt_refresh">Kunne opdatere liste over sæt</string>
   <!--AppSettingsActivity-->
   <string name="app_settings">Indstillinger</string>
   <string name="app_settings_user_interface">Brugerflade</string>
@@ -55,6 +60,11 @@
     <item quantity="other">%d kke-accepterede certifikater</item>
   </plurals>
   <string name="app_settings_debug">Debugging</string>
+  <string name="app_settings_log_to_external_storage">Log til ekstern fil</string>
+  <string name="app_settings_log_to_external_storage_on">Logger til eksternt lager (hvis muligt)</string>
+  <string name="app_settings_log_to_external_storage_off">Ekstern logning deaktiveret</string>
+  <string name="app_settings_show_debug_info">Vis debug-info</string>
+  <string name="app_settings_show_debug_info_details">Vis/del software og opsætningsoplysninger</string>
   <!--AccountActivity-->
   <string name="account_synchronize_now">Synkroniser nu</string>
   <string name="account_synchronizing_now">Synkroniserer nu</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d88b0168..418d21d4 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -22,6 +22,8 @@
   <string name="startup_opentasks_not_installed_message">Az OpenTasks alkalmazás nincs telepítve vagy nem elérhető, ezért a DAVdroid nem lesz képes a feladatlisták szinkronizálására.  Az OpenTasks telepítése után telepítse újra a DAVdroid-ot majd hozza létre a fiókot újra.</string>
   <string name="startup_opentasks_not_installed_install">Az OpenTasks telepítése</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">Licencfeltételek</string>
+  <string name="about_license_info_no_warranty">Ehhez a program SEMMIFÉLE GARANCIA NEM JÁR.   Ez a program szabad szoftver, ami a bizonyos feltételek mellett szabadon terjeszthető.</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">DAVdroid fájlalapú naplózás</string>
   <string name="logging_to_external_storage">Naplózás külső tárhelyre: %s</string>
@@ -34,6 +36,7 @@
   <string name="navigation_drawer_subtitle">CalDAV/CardDAV szinkronizációs adapter</string>
   <string name="navigation_drawer_about">Névjegy / Licenc</string>
   <string name="navigation_drawer_settings">Beállítások</string>
+  <string name="navigation_drawer_news_updates">Hírek és frissítések</string>
   <string name="navigation_drawer_external_links">Weblapok</string>
   <string name="navigation_drawer_website">Honlap</string>
   <string name="navigation_drawer_faq">GYIK</string>
@@ -41,6 +44,8 @@
   <string name="navigation_drawer_donate">Támogatás</string>
   <string name="account_list_empty">Üdvözöljük a DAVdroid felhasználók között!\n\nMost már felvehet CalDAV/CardDav fiókokat.</string>
   <!--DavService-->
+  <string name="dav_service_refresh_failed">Szolgáltatások felderítése nem sikerült</string>
+  <string name="dav_service_refresh_couldnt_refresh">Gyűjteménylista frissítése nem sikerült</string>
   <!--AppSettingsActivity-->
   <string name="app_settings">Beállítások</string>
   <string name="app_settings_user_interface">Felhasználói felület</string>
@@ -55,6 +60,11 @@
     <item quantity="other">%d tanúsítvány megbízhatósága törölve</item>
   </plurals>
   <string name="app_settings_debug">Hibakeresés</string>
+  <string name="app_settings_log_to_external_storage">Naplózás fájlba</string>
+  <string name="app_settings_log_to_external_storage_on">Naplózás külső tárhelyre (ha elérhető)</string>
+  <string name="app_settings_log_to_external_storage_off">Fájlalapú naplózás kikapcsolva</string>
+  <string name="app_settings_show_debug_info">Hibakeresési információ megtekintése</string>
+  <string name="app_settings_show_debug_info_details">Szoftver- és konfigurációs részletek megtekintése/megosztása</string>
   <!--AccountActivity-->
   <string name="account_synchronize_now">Szinkronizálás most</string>
   <string name="account_synchronizing_now">Szinkronizálás</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a5a873bd..6d96d7ae 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -22,6 +22,8 @@
   <string name="startup_opentasks_not_installed_message">OpenTasks アプリがインストールされていないか、アクセスできないため、DAVdroid は、タスクリストを同期することができません。 OpenTasks をインストールした後、DAVdroidを再インストールして、再度アカウントを追加してください。</string>
   <string name="startup_opentasks_not_installed_install">OpenTasks をインストール</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">ライセンス規約</string>
+  <string name="about_license_info_no_warranty">このプログラムは完全に無保証で提供されます。これはフリーソフトウェアで、特定の条件下での再頒布を歓迎します。</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">DAVdroid ファイルログ</string>
   <string name="logging_to_external_storage">外部ストレージにログ: %s</string>
@@ -57,6 +59,11 @@
     <item quantity="other">%d 証明書の信頼を解除しました</item>
   </plurals>
   <string name="app_settings_debug">デバッグ</string>
+  <string name="app_settings_log_to_external_storage">外部ファイルにログ出力</string>
+  <string name="app_settings_log_to_external_storage_on">(可能な場合) 外部ストレージにログ出力します</string>
+  <string name="app_settings_log_to_external_storage_off">外部ファイルログ出力は無効です</string>
+  <string name="app_settings_show_debug_info">デバッグ情報を表示</string>
+  <string name="app_settings_show_debug_info_details">ソフトウェアと設定の詳細を表示/共有</string>
   <!--AccountActivity-->
   <string name="account_synchronize_now">今すぐ同期</string>
   <string name="account_synchronizing_now">同期中</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fb19b307..256eb7a8 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -22,6 +22,8 @@
   <string name="startup_opentasks_not_installed_message">O aplicativo OpenTasks não está instalado ou está inacessível, não sendo possível sincronizar suas listas de tarefas com o DAVdroid. Reinstale o DAVdroid e então adicione suas contas novamente depois da instalação do OpenTasks.</string>
   <string name="startup_opentasks_not_installed_install">Instalar o OpenTasks</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">Termos da Licença</string>
+  <string name="about_license_info_no_warranty">Este programa é distribuído SEM NENHUMA GARANTIA. Ele é software livre e pode ser redistribuído sob algumas condições.</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">Registro do arquivo do DAVdroid</string>
   <string name="logging_to_external_storage">Registrando no arquivo externo: %s</string>
@@ -34,6 +36,7 @@
   <string name="navigation_drawer_subtitle">Adaptador de sincronização CalDAV/CardDAV</string>
   <string name="navigation_drawer_about">Sobre / Licença</string>
   <string name="navigation_drawer_settings">Configurações</string>
+  <string name="navigation_drawer_news_updates">Novidades e atualizações</string>
   <string name="navigation_drawer_external_links">Links externos</string>
   <string name="navigation_drawer_website">Site na Web</string>
   <string name="navigation_drawer_faq">Perguntas fequentes</string>
@@ -41,6 +44,8 @@
   <string name="navigation_drawer_donate">Doações</string>
   <string name="account_list_empty">Bem-vindo ao DAVdroid!\n\nVocê pode adicionar uma conta CalDAV/CardDAV agora.</string>
   <!--DavService-->
+  <string name="dav_service_refresh_failed">Falha na detecção do serviço</string>
+  <string name="dav_service_refresh_couldnt_refresh">Não foi possível atualizar a lista da coleção</string>
   <!--AppSettingsActivity-->
   <string name="app_settings">Configurações</string>
   <string name="app_settings_user_interface">Interface de usuário</string>
@@ -55,6 +60,11 @@
     <item quantity="other">Retirada a confiança de %d certificados</item>
   </plurals>
   <string name="app_settings_debug">Depuração</string>
+  <string name="app_settings_log_to_external_storage">Registrar em arquivo externo</string>
+  <string name="app_settings_log_to_external_storage_on">Registrando no armazenamento externo (se disponível)</string>
+  <string name="app_settings_log_to_external_storage_off">O registro em arquivo externo está desativado</string>
+  <string name="app_settings_show_debug_info">Mostrar informações de depuração</string>
+  <string name="app_settings_show_debug_info_details">Exibir/compartilhar o software e os detalhes da configuração</string>
   <!--AccountActivity-->
   <string name="account_synchronize_now">Sincronizar agora</string>
   <string name="account_synchronizing_now">Sincronizando agora</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b34437b2..895c3395 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -22,6 +22,8 @@
   <string name="startup_opentasks_not_installed_message">OpenTasks 应用未安装或不可见，因此 DAVdroid 无法同步任务列表。请在安装 OpenTasks 后，重新安装 DAVdroid，再增加账户。</string>
   <string name="startup_opentasks_not_installed_install">安装 OpenTasks</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">许可协议</string>
+  <string name="about_license_info_no_warranty">本程序不附带任何担保。这是一款自由软件，你可以有条件地传播它。</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">DAVdroid 文件日志</string>
   <string name="logging_to_external_storage">记录日志到外部存储 %s</string>
@@ -34,6 +36,7 @@
   <string name="navigation_drawer_subtitle">CalDAV/CardDAV 同步器</string>
   <string name="navigation_drawer_about">关于 / 许可</string>
   <string name="navigation_drawer_settings">设置</string>
+  <string name="navigation_drawer_news_updates">最新消息</string>
   <string name="navigation_drawer_external_links">外部网站</string>
   <string name="navigation_drawer_website">应用网站</string>
   <string name="navigation_drawer_faq">常见问题</string>
@@ -41,6 +44,8 @@
   <string name="navigation_drawer_donate">捐助</string>
   <string name="account_list_empty">欢迎使用 DAVdroid！\n\n现在你可以增加 CalDAV/CardDAV 账户。</string>
   <!--DavService-->
+  <string name="dav_service_refresh_failed">服务配置检测失败</string>
+  <string name="dav_service_refresh_couldnt_refresh">无法刷新集合列表</string>
   <!--AppSettingsActivity-->
   <string name="app_settings">设置</string>
   <string name="app_settings_user_interface">用户界面</string>
@@ -54,6 +59,11 @@
     <item quantity="other">已删除 %d 个证书</item>
   </plurals>
   <string name="app_settings_debug">调试</string>
+  <string name="app_settings_log_to_external_storage">外部文件日志</string>
+  <string name="app_settings_log_to_external_storage_on">记录日志到外部存储（如果可用）</string>
+  <string name="app_settings_log_to_external_storage_off">外部文件日志已禁用</string>
+  <string name="app_settings_show_debug_info">显示调试信息</string>
+  <string name="app_settings_show_debug_info_details">查看软件和配置信息</string>
   <!--AccountActivity-->
   <string name="account_synchronize_now"> 立即同步</string>
   <string name="account_synchronizing_now">正在同步</string>
@@ -159,9 +169,9 @@
   <string name="delete_collection_confirm_warning">这个集合 %s 及其所有数据将会从服务器删除。</string>
   <string name="delete_collection_deleting_collection">正在删除集合</string>
   <!--ExceptionInfoFragment-->
-  <string name="exception">出现错误。</string>
-  <string name="exception_httpexception">出现 HTTP 错误。</string>
-  <string name="exception_ioexception">出现 I/O 错误。</string>
+  <string name="exception">出现错误</string>
+  <string name="exception_httpexception">出现 HTTP 错误</string>
+  <string name="exception_ioexception">出现 I/O 错误</string>
   <string name="exception_show_details">显示详情</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">调试信息</string>