From bb907070cd3b296cff7f121e1b48b846e8757e30 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Fri, 13 Mar 2020 16:11:09 +1100
Subject: [PATCH] Update files for 3.36.0

---
 NEWS                                      | 68 +++++++++++++++++++++++
 desktop/org.gnome.Geary.appdata.xml.in.in |  5 +-
 meson.build                               |  2 +-
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 5ebb34ba..d08af77d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,71 @@
+Version 3.36
+~~~~~~~~~~~~
+Released: 2020-03-13
+
+Enhancements included in this release:
+ * New and improved responsive composer interface
+ * Drag and drop image files into rich text messages
+ * Paste images from the clipboard into rich text messages
+ * Improved composer missing attachment detection
+ * Access emoji chooser in composer via shortcut or context menu
+ * Extend undo for email actions such as archiving, marking
+ * Undo sending, saving and discarding composed email
+ * Undo editing in text fields, including in the composer
+ * Open more than one main window
+ * New and improved responsive preferences interface
+ * Using single key shortcuts for email actions is now optional
+ * Single key shortcuts have been brought up to date with Gmail
+ * App-wide notification preferences now handled by desktop
+ * Numerous bug fixes and user interface improvements
+ * Numerous user interface translation updates
+
+Thanks to all who contributed code fixes and enhancements to this
+release:
+ * Adam Dingle
+ * Adrien Plazas
+ * Alex Henrie
+ * Bilal Elmoussaoui
+ * Chris Heywood
+ * Daniel Kahn Gillmor
+ * James Westman
+ * João Loureiro
+ * Konstantin Kharlamov
+ * Mario Ravalli
+ * Mart Raudsepp
+ * Niels De Graef
+ * Tobias Sette
+ * Torben
+ * Алексей Шилин
+
+Thanks also to all who contributed translations, for the user
+interface:
+ * Alexandre Franke (fr)
+ * Anders Jonsson (sv)
+ * Andika Triwidada (id)
+ * Asier Sarasua Garmendia (eu)
+ * Balázs Meskó (hu)
+ * Cheng-Chia Tseng (zh_TW)
+ * Daniel Mustieles (es)
+ * Emin Tufan Çetin (tr)
+ * Enrico Nicoletto (pt_BR)
+ * Federico Bruni (it)
+ * Jiri Grönroos (fi)
+ * Jordi Mas (ca)
+ * Kukuh Syafaat (id)
+ * Marek Černocký (cs)
+ * Nathan Follens (nl)
+ * Piotr Drąg (pl)
+ * Rafael Fontenelle (pt_BR)
+ * sicklylife (ja)
+ * Tim Sabsch (de)
+
+And for the user manual:
+ * Daniel Mustieles (es)
+ * Emin Tufan Çetin (tr)
+ * Federico Bruni (it)
+ * Marek Černocký (cs)
+ * Piotr Drąg (pl)
+
 Version 3.35.90
 ~~~~~~~~~~~~~~~
 Released: 2020-03-01
diff --git a/desktop/org.gnome.Geary.appdata.xml.in.in b/desktop/org.gnome.Geary.appdata.xml.in.in
index 3201a6d1..47f572bd 100644
--- a/desktop/org.gnome.Geary.appdata.xml.in.in
+++ b/desktop/org.gnome.Geary.appdata.xml.in.in
@@ -41,7 +41,7 @@
   <url type="bugtracker">https://wiki.gnome.org/Apps/Geary/ReportingABug</url>
   <url type="translate">https://wiki.gnome.org/Apps/Geary/Translating</url>
   <url type="donation">https://www.gnome.org/friends/</url>
-  
+
   <screenshots>
     <screenshot>
       <!-- Translators: A screenshot description. -->
@@ -89,7 +89,7 @@
   <translation type="gettext">geary</translation>
 
   <releases>
-    <release version="3.36" date="">
+    <release version="3.36" date="2020-03-13">
       <description>
         <p>Enhancements included in this release:</p>
         <ul>
@@ -106,7 +106,6 @@
           <li>Using single key shortcuts for email actions is now optional</li>
           <li>Single key shortcuts have been brought up to date with Gmail</li>
           <li>App-wide notification preferences now handled by desktop</li>
-          <li>Initial plugin system</li>
           <li>Numerous bug fixes and user interface improvements</li>
           <li>Numerous user interface translation updates</li>
         </ul>
diff --git a/meson.build b/meson.build
index e92f96c5..0bdd1568 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('geary', [ 'vala', 'c' ],
-  version: '3.35.90',
+  version: '3.36.0',
   license: 'LGPL2.1+',
   meson_version: '>= 0.50',
 )