From 4f43c56cf9d7bc01a8f26aa434bf052b038c331c Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@mailbox.org>
Date: Wed, 14 Jun 2017 16:32:19 +0200
Subject: [PATCH] Release v1.0.0

---
 CHANGELOG.md                                           | 6 +++---
 app/build.gradle                                       | 4 ++--
 app/src/main/res/values-pl/strings-preferences.xml     | 1 +
 app/src/main/res/values-zh-rTW/strings-preferences.xml | 4 ++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 213f8d19..ea05afe3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-### v0.2.9
-- Use opoc/Helpers
-- Use opoc/AdBlock
+### v1.0.0 (2017-06-14)
 - Added AMOLED mode
 - Improve NavDrawer
+- Improve Shared by notice
+- Use opoc/Helpers,AdBlock
 
 ### v0.2.7 (2017-05-26)
 - Small improvements
diff --git a/app/build.gradle b/app/build.gradle
index 8ca7f3f5..2fafc546 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         minSdkVersion 17
         targetSdkVersion 24
 
-        versionCode 18
-        versionName "0.2.8"
+        versionCode 20
+        versionName "1.0.0"
 
         applicationId "com.github.dfa.diaspora_android"
         resValue 'string', 'app_name', "dandelion*"
diff --git a/app/src/main/res/values-pl/strings-preferences.xml b/app/src/main/res/values-pl/strings-preferences.xml
index 16f14526..605bad33 100644
--- a/app/src/main/res/values-pl/strings-preferences.xml
+++ b/app/src/main/res/values-pl/strings-preferences.xml
@@ -29,6 +29,7 @@
   <string name="pref_title__accent_color">Kolor dodatkowy</string>
   <string name="pref_desc__accent_color">Kolor paska postępu</string>
   <string name="pref_title__primary_color__amoled_mode">Tryb AMOLED</string>
+  <string name="pref_desc__primary_color__amoled_mode">Nadpisz kolory w wielu częściach aplikacji używając czarnego przyjaznego dla ekranów AMOLED. By zobaczyć zmiany musisz zrestartować aplikację. By przeglądać diasporę* w ciemności musisz także aktywować Ciemny (Dark) motyw. Opcję tę znajdziesz w ustawieniach Twojego konta diaspory*.</string>
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">Rozszerzone powiadomienia</string>
   <string name="pref_desc__extended_notifications">Dodaj do ikony powiadomień menu wyboru kategorii powiadomień</string>
diff --git a/app/src/main/res/values-zh-rTW/strings-preferences.xml b/app/src/main/res/values-zh-rTW/strings-preferences.xml
index db770360..26877b9e 100644
--- a/app/src/main/res/values-zh-rTW/strings-preferences.xml
+++ b/app/src/main/res/values-zh-rTW/strings-preferences.xml
@@ -28,6 +28,8 @@
   <string name="pref_desc__primary_color">工具列使用的顏色</string>
   <string name="pref_title__accent_color">強調顏色</string>
   <string name="pref_desc__accent_color">進度條使用的顏色</string>
+  <string name="pref_title__primary_color__amoled_mode">AMOLED 顯示模式</string>
+  <string name="pref_desc__primary_color__amoled_mode">在應用程式中使用適合 AMOLED 螢幕的黑色來顯示。改變這項設定後需要重開應用程式。另外你還需要使用色彩主題 Dark 才會有深色的版面，請到你的 diaspora* 帳號設定頁面修改。</string>
   <!-- Notifications dropdown -->
   <string name="pref_title__extended_notifications">延伸型通知</string>
   <string name="pref_desc__extended_notifications">將通知鈴伸展成為顯示通知類別的下拉式選單</string>
@@ -86,4 +88,6 @@
   <string name="dialog_content__wipe_settings">將要重設此應用程式的所有設定為預設值，並登出你在所有豆莢的帳號。不過不會變動已經下載了的圖片。確定要繼續嗎？</string>
   <!-- Recently added - Please move to right section-->
   <!-- Sorry -->
+  <string name="pref_desc__adblock_enable">開啟基本的廣告封鎖器。廣告可能會出現在嵌入式視圖之類的地方。</string>
+  <string name="pref_title__adblock_enable">廣告封鎖</string>
 </resources>