From bd903357aeaadca444eb9a3d8769bc1a12fe67cf Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 5 Jun 2020 15:16:18 -0500
Subject: [PATCH] Update changelog

---
 CHANGELOG.md                                  | 22 +++++++++++++++++++
 app/src/main/res/values/changelog.xml         | 14 +++++++++---
 .../android/en-US/changelogs/90600.txt        | 11 ++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/90600.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 014085506..3750539a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,28 @@
 Change Log
 ---
 =======
+### 9.6 (2020-06-05)
+
+* Add support for offline lists. Offline lists support manual ordering and infinite-depth subtasks
+* Rename 'My order' to 'Astrid manual sorting' for 'My Tasks', 'Today', and tags
+* Add '⚙ > Look and feel > Disable sort groups'
+* Add '⚙ > Look and feel > Open last viewed list'
+* Add '⚙ > Look and feel > Chips' toggles for subtasks, places, lists, and tags
+* Add '⚙ > Navigation drawer > Lists'
+* Add '⚙ > Task defaults > Default list'
+* Add '⚙ > Task defaults > New tasks on top'
+* Add '⚙ > Advanced > Astrid manual sorting'
+* Fix preference reset button
+* Update translations
+  * Basque - @osoitz
+  * Czech - @vitSkalicky
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * Hungarian - kaciokos
+  * Simplified Chinese - @sr093906
+  * Spanish - @FlorianLeChat
+  * Turkish - etc
+
 ### 9.5 (2020-06-03)
 
 * Drag and drop to change subtasks in all list types
diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
index 10a7cb92f..f149c7ebd 100644
--- a/app/src/main/res/values/changelog.xml
+++ b/app/src/main/res/values/changelog.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="changelog">
-        <item>Drag and drop to change subtasks in all list types</item>
-        <item>Drag and drop to reprioritize or reschedule tasks while sorting by due date or priority</item>
-        <item>Bug fixes and translation updates</item>
+        <item>Add support for offline lists. Offline lists support manual ordering and infinite-depth subtasks</item>
+        <item>Rename \'My order\' to \'Astrid manual sorting\' for \'My Tasks\', \'Today\', and tags</item>
+        <item>Add \'⚙ > Look and feel > Disable sort groups\'</item>
+        <item>Add \'⚙ > Look and feel > Open last viewed list\'</item>
+        <item>Add \'⚙ > Look and feel > Chips\' toggles for subtasks, places, lists, and tags</item>
+        <item>Add \'⚙ > Navigation drawer > Lists\'</item>
+        <item>Add \'⚙ > Task defaults > Default list\'</item>
+        <item>Add \'⚙ > Task defaults > New tasks on top\'</item>
+        <item>Add \'⚙ > Advanced > Astrid manual sorting\'</item>
+        <item>Fix preference reset button</item>
+        <item>Update translations</item>
     </string-array>
 </resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/90600.txt b/fastlane/metadata/android/en-US/changelogs/90600.txt
new file mode 100644
index 000000000..5a2061154
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90600.txt
@@ -0,0 +1,11 @@
+* Add support for offline lists. Offline lists support manual ordering and infinite-depth subtasks
+* Rename 'My order' to 'Astrid manual sorting' for 'My Tasks', 'Today', and tags
+* Add '⚙ > Look and feel > Disable sort groups'
+* Add '⚙ > Look and feel > Open last viewed list'
+* Add '⚙ > Look and feel > Chips' toggles for subtasks, places, lists, and tags
+* Add '⚙ > Navigation drawer > Lists'
+* Add '⚙ > Task defaults > Default list'
+* Add '⚙ > Task defaults > New tasks on top'
+* Add '⚙ > Advanced > Astrid manual sorting'
+* Fix preference reset button
+* Update translations