Update README.md and AppSteam metadata (#360)

- Add FlatHub badge
- Remove periods from bullet points
- Add latest releases to AppStream metadata
- Step to update AppStream metadata in release process
- Update requirements to use current project names

2 files changed, 55 insertions, 28 deletions

diff --git a/README.md b/README.md
index eefb6376..59d03966 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 [![CircleCI](https://circleci.com/gh/midori-browser/core.svg?style=svg)](https://circleci.com/gh/midori-browser/core)
 [![Snap Status](https://build.snapcraft.io/badge/midori-browser/core.svg)](https://build.snapcraft.io/user/midori-browser/core)
+[![FlatHub](https://img.shields.io/badge/FlatHub-gray.svg)](https://flathub.org/apps/details/org.midori_browser.Midori)
 [![Telegram](https://img.shields.io/badge/Telegram-Chat-gray.svg?style=flat&logo=telegram&colorA=5583a4&logoColor=fff)](https://www.midori-browser.org/telegram)
 [![Twitter](https://img.shields.io/twitter/follow/midoriweb.svg?style=social&label=Follow)](https://twitter.com/midoriweb)
 [![Donate](https://img.shields.io/badge/PayPal-Donate-gray.svg?style=flat&logo=paypal&colorA=0071bb&logoColor=fff)](https://www.midori-browser.org/donate)
@@ -7,7 +8,7 @@
 [![Patreon](https://img.shields.io/badge/PATREON-Pledge-red.svg)](https://www.patreon.com/midoribrowser)
 
 <p align="center">
-    <img src="icons/scalable/apps/midori.svg"/>
+    <img src="icons/scalable/apps/org.midori_browser.Midori.svg"/>
 </p>
 
 <p align="center">
@@ -21,17 +22,17 @@ Midori is a lightweight yet powerful web browser which runs just as well on litt
 
 **Privacy out of the box**
 
-* Adblock filter list support.
-* Private browsing.
-* Manage cookies and scripts.
+* Adblock filter list support
+* Private browsing
+* Manage cookies and scripts
 
 **Productivity features**
 
-* Open a 1000 tabs instantly.
-* Easy web apps creation.
-* Customizable side panels.
-* User scripts and styles a la Greasemonkey.
-* Web developer tools powered by WebKit.
+* Open a 1000 tabs instantly
+* Easy web apps creation
+* Customizable side panels
+* User scripts and styles a la Greasemonkey
+* Web developer tools powered by WebKit
 * Cross-browser extensions compatible with Chrome, Firefox, Opera and Vivaldi
 
 Please report comments, suggestions and bugs to:
@@ -50,6 +51,10 @@ you can install the **latest stable** version of Midori
 
 > **Spoilers:** For those more adventurous types out there, trying out the preview of the next version is only the switch of a channel away.
 
+You can also install Midori from [FlatHub](https://flathub.org/apps/details/org.midori_browser.Midori).
+
+    flatpak install flathub org.midori_browser.Midori
+
 # Installing Midori on Android
 
 You can opt-in for the [beta release on the Play Store](https://play.google.com/apps/testing/org.midori_browser.midori).
@@ -58,16 +63,15 @@ You can opt-in for the [beta release on the Play Store](https://play.google.com/
 
 **Requirements**
 
-* GLib 2.46.2
-* GTK+ 3.12
-* gcr-3 2.32
-* [WebKit2GTK+](https://webkitgtk.org/) 2.16.6
-* libsoup 2.48.0
-* sqlite 3.6.19
+* [GLib](https://wiki.gnome.org/Projects/GLib) 2.46.2
+* [GTK](https://www.gtk.org) 3.12
+* [WebKitGTK](https://webkitgtk.org/) 2.16.6
+* [libsoup](https://wiki.gnome.org/Projects/libsoup) 2.48.0
+* [sqlite](https://sqlite.org) 3.6.19
 * [Vala](https://wiki.gnome.org/Projects/Vala) 0.30
 * GCR 2.32
-* Peas
-* JSON-Glib 0.12
+* [Libpeas](https://wiki.gnome.org/Projects/Libpeas)
+* [JSON-Glib](https://wiki.gnome.org/Projects/JsonGlib) 0.12
 
 Install dependencies on Astian OS, Ubuntu, Debian or other Debian-based distros:
 
@@ -122,6 +126,7 @@ capped at a release once every 3 months ie. at the last of the third month.
 
 Update `CORE_VERSION` in `CMakeLists.txt` to `10.0`.
 Add a section to `CHANGELOG.md`.
+Add release to `data/org.midori_browser.Midori.appdata.xml.in`.
 
     git commit -p -v -m "Release Midori 10.0"
     git checkout -B release-10.0
diff --git a/data/org.midori_browser.Midori.appdata.xml.in b/data/org.midori_browser.Midori.appdata.xml.in
index d318894d..deccd784 100644
--- a/data/org.midori_browser.Midori.appdata.xml.in
+++ b/data/org.midori_browser.Midori.appdata.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015-2018 Christian Dywan <christian@twotoasts.de> -->
+<!-- Copyright 2015-2019 Christian Dywan <christian@twotoasts.de> -->
 <component type="desktop">
   <id>org.midori_browser.Midori</id>
   <launchable type="desktop-id">org.midori_browser.Midori.desktop</launchable>
@@ -22,19 +22,20 @@
     <p>
     Midori is a lightweight yet powerful web browser which runs just as well on little embedded computers named for delicious pastries as it does on beefy machines with a core temperature exceeding that of planet earth. And it looks good doing that, too. Oh, and of course it's free software.
     </p>
-    <p><b>Privacy out of the box</b></p>
+    <p>Privacy out of the box</p>
     <ul>
-      <li>Adblock filter list support.</li>
-      <li>Private browsing.</li>
-      <li>Manage cookies and scripts.</li>
+      <li>Adblock filter list support</li>
+      <li>Private browsing</li>
+      <li>Manage cookies and scripts</li>
     </ul>
-    <p><b></b></p>
+    <p>Productivity features</p>
     <ul>
-      <li>Open a 1000 tabs instantly.</li>
-      <li>Easy web apps creation.</li>
-      <li>Customizable side panels.</li>
-      <li>User scripts and styles a la Greasemonkey.</li>
-      <li>Web developer tools powered by WebKit.</li>
+      <li>Open a 1000 tabs instantly</li>
+      <li>Easy web apps creation</li>
+      <li>Customizable side panels</li>
+      <li>User scripts and styles a la Greasemonkey</li>
+      <li>Web developer tools powered by WebKit</li>
+      <li>Cross-browser extensions compatible with Chrome, Firefox, Opera and Vivaldi</li>
     </ul>
   </description>
   <url type="homepage">https://www.midori-browser.org/</url>
@@ -51,6 +52,27 @@
   <translation type="gettext">midori</translation>
   <content_rating type="oars-1.1" />
   <releases>
+    <release version="9.0" date="2019-07-27">
+      <description>
+        <ul>
+          <li>Use OpenGraph images for Speed Dial shortcuts</li>
+          <li>Better support for Javascript popups</li>
+          <li>(Re)store pinned tabs in the session</li>
+          <li>Re-introduce the Trust (certificate) button</li>
+          <li>Avoid key input recursion causing high CPU</li>
+          <li>Close Tab/ Other context menu items</li>
+          <li>Paste and Proceed option in the urlbar</li>
+          <li>Better urlbar suggestion escaping</li>
+          <li>Web extensions: Support for a sidebar action (experimental)</li>
+          <li>Merge app and page menu into one</li>
+          <li>Better focus handling of re-opened and background tabs</li>
+          <li>Show volume icon for tabs playing music</li>
+        </ul>
+      </description>
+    </release>
+    <release version="8.0" date="2019-02-28"/>
+    <release version="7.0" date="2018-11-30"/>
+    <release version="6.0" date="2018-10-31"/>
     <release version="0.5.11" date="2015-08-30"/>
   </releases>
 </component>