From 16b5e8821fc8cae027bded3866dd2a7fc1aa6e9c Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
Date: Mon, 1 Jul 2019 12:43:26 +0200
Subject: [PATCH] Build system: init porting to meson

---
 .gitignore                                    |   1 +
 Makefile                                      |   6 -
 autogen.sh                                    |   1 -
 bin/uberwriter                                |  59 --------
 ...echt.UberWriter.Plugin.TexLive.appdata.xml |   4 +-
 .../flatpak/de.wolfvollprecht.UberWriter.json | 102 +++++++++++++
 .../flatpak}/flatpak_gnome_web_photo.json     |   2 +-
 .../flatpak}/flatpak_texlive.json             |   2 +-
 .../flatpak}/flatpak_texlive_flathub.json     |   2 +-
 .../flatpak}/texlive.profile                  |   0
 .../flatpak}/texlive_install.sh               |   0
 build-aux/meson_post_install.py               |  13 ++
 configure                                     |   1 -
 ...olfvollprecht.UberWriter.appdata.xml.in.in |   8 +-
 ...de.wolfvollprecht.UberWriter.desktop.in.in |   2 +-
 .../de.wolfvollprecht.UberWriter-symbolic.svg |   0
 .../de.wolfvollprecht.UberWriter.svg          |   0
 data/icons/meson.build                        |  11 ++
 data/meson.build                              |  73 ++++++++++
 flatpak/uberwriter.json                       | 134 ------------------
 po/__init__.py => help/LINGUAS                |   0
 help/meson.build                              |  16 +++
 meson.build                                   |  61 ++++++++
 meson_options.txt                             |   9 ++
 po/LINGUAS                                    |  21 +++
 po/POTFILES.in                                |   0
 po/{ca/LC_MESSAGES/uberwriter-ca.po => ca.po} |   0
 po/ca/LC_MESSAGES/uberwriter.mo               | Bin 5856 -> 0 bytes
 .../uberwriter-ca_ES.po => ca_ES.po}          |   0
 po/ca_ES/LC_MESSAGES/uberwriter.mo            | Bin 12808 -> 0 bytes
 po/compile_translations.sh                    |   2 -
 po/{cs/LC_MESSAGES/uberwriter-cs.po => cs.po} |   0
 po/cs/LC_MESSAGES/uberwriter.mo               | Bin 996 -> 0 bytes
 po/{de/LC_MESSAGES/uberwriter-de.po => de.po} |   0
 po/de/LC_MESSAGES/uberwriter.mo               | Bin 12603 -> 0 bytes
 .../uberwriter-en_GB.po => en_GB.po}          |   0
 po/en_GB/LC_MESSAGES/uberwriter.mo            | Bin 7518 -> 0 bytes
 po/{es/LC_MESSAGES/uberwriter-es.po => es.po} |   0
 po/es/LC_MESSAGES/uberwriter.mo               | Bin 11556 -> 0 bytes
 po/{eu/LC_MESSAGES/uberwriter-eu.po => eu.po} |   0
 po/eu/LC_MESSAGES/uberwriter.mo               | Bin 5713 -> 0 bytes
 po/{fr/LC_MESSAGES/uberwriter-fr.po => fr.po} |   0
 po/fr/LC_MESSAGES/uberwriter.mo               | Bin 11168 -> 0 bytes
 po/{hu/LC_MESSAGES/uberwriter-hu.po => hu.po} |   0
 po/hu/LC_MESSAGES/uberwriter.mo               | Bin 3880 -> 0 bytes
 po/{it/LC_MESSAGES/uberwriter-it.po => it.po} |   0
 po/it/LC_MESSAGES/uberwriter.mo               | Bin 12843 -> 0 bytes
 po/meson.build                                |   2 +
 po/{pl/LC_MESSAGES/uberwriter-pl.po => pl.po} |   0
 po/pl/LC_MESSAGES/uberwriter.mo               | Bin 4447 -> 0 bytes
 po/{pt/LC_MESSAGES/uberwriter-pt.po => pt.po} |   0
 po/pt/LC_MESSAGES/uberwriter.mo               | Bin 4720 -> 0 bytes
 .../uberwriter-pt_BR.po => pt_BR.po}          |   0
 po/pt_BR/LC_MESSAGES/uberwriter.mo            | Bin 4622 -> 0 bytes
 po/{ru/LC_MESSAGES/uberwriter-ru.po => ru.po} |   0
 po/ru/LC_MESSAGES/uberwriter.mo               | Bin 5860 -> 0 bytes
 po/{si/LC_MESSAGES/uberwriter-si.po => si.po} |   0
 po/si/LC_MESSAGES/uberwriter.mo               | Bin 6846 -> 0 bytes
 po/{sv/LC_MESSAGES/uberwriter-sv.po => sv.po} |   0
 po/sv/LC_MESSAGES/uberwriter.mo               | Bin 4799 -> 0 bytes
 po/{tr/LC_MESSAGES/uberwriter-th.po => th.po} |   0
 po/{tr/LC_MESSAGES/uberwriter-tr.po => tr.po} |   0
 po/tr/LC_MESSAGES/uberwriter.mo               | Bin 793 -> 0 bytes
 po/{vi/LC_MESSAGES/uberwriter-vi.po => vi.po} |   0
 po/vi/LC_MESSAGES/uberwriter.mo               | Bin 627 -> 0 bytes
 .../uberwriter-zh_CN.po => zh_CN.po}          |   0
 po/zh_CN/LC_MESSAGES/uberwriter.mo            | Bin 3973 -> 0 bytes
 .../uberwriter-zh_TW.po => zh_TW.po}          |   0
 po/zh_TW/LC_MESSAGES/uberwriter.mo            | Bin 4302 -> 0 bytes
 69 files changed, 319 insertions(+), 213 deletions(-)
 delete mode 100644 Makefile
 delete mode 100755 autogen.sh
 delete mode 100755 bin/uberwriter
 rename {flatpak => build-aux/flatpak}/de.wolfvollprecht.UberWriter.Plugin.TexLive.appdata.xml (86%)
 create mode 100644 build-aux/flatpak/de.wolfvollprecht.UberWriter.json
 rename {flatpak => build-aux/flatpak}/flatpak_gnome_web_photo.json (99%)
 rename {flatpak => build-aux/flatpak}/flatpak_texlive.json (98%)
 rename {flatpak => build-aux/flatpak}/flatpak_texlive_flathub.json (98%)
 rename {flatpak => build-aux/flatpak}/texlive.profile (100%)
 rename {flatpak => build-aux/flatpak}/texlive_install.sh (100%)
 create mode 100755 build-aux/meson_post_install.py
 delete mode 100755 configure
 rename flatpak/de.wolfvollprecht.UberWriter.appdata.xml => data/de.wolfvollprecht.UberWriter.appdata.xml.in.in (96%)
 rename de.wolfvollprecht.UberWriter.desktop => data/de.wolfvollprecht.UberWriter.desktop.in.in (86%)
 rename data/{media => icons}/de.wolfvollprecht.UberWriter-symbolic.svg (100%)
 rename data/{media => icons}/de.wolfvollprecht.UberWriter.svg (100%)
 create mode 100644 data/icons/meson.build
 create mode 100644 data/meson.build
 delete mode 100644 flatpak/uberwriter.json
 rename po/__init__.py => help/LINGUAS (100%)
 create mode 100644 help/meson.build
 create mode 100644 meson.build
 create mode 100644 meson_options.txt
 create mode 100644 po/LINGUAS
 create mode 100644 po/POTFILES.in
 rename po/{ca/LC_MESSAGES/uberwriter-ca.po => ca.po} (100%)
 delete mode 100644 po/ca/LC_MESSAGES/uberwriter.mo
 rename po/{ca_ES/LC_MESSAGES/uberwriter-ca_ES.po => ca_ES.po} (100%)
 delete mode 100644 po/ca_ES/LC_MESSAGES/uberwriter.mo
 delete mode 100755 po/compile_translations.sh
 rename po/{cs/LC_MESSAGES/uberwriter-cs.po => cs.po} (100%)
 delete mode 100644 po/cs/LC_MESSAGES/uberwriter.mo
 rename po/{de/LC_MESSAGES/uberwriter-de.po => de.po} (100%)
 delete mode 100644 po/de/LC_MESSAGES/uberwriter.mo
 rename po/{en_GB/LC_MESSAGES/uberwriter-en_GB.po => en_GB.po} (100%)
 delete mode 100644 po/en_GB/LC_MESSAGES/uberwriter.mo
 rename po/{es/LC_MESSAGES/uberwriter-es.po => es.po} (100%)
 delete mode 100644 po/es/LC_MESSAGES/uberwriter.mo
 rename po/{eu/LC_MESSAGES/uberwriter-eu.po => eu.po} (100%)
 delete mode 100644 po/eu/LC_MESSAGES/uberwriter.mo
 rename po/{fr/LC_MESSAGES/uberwriter-fr.po => fr.po} (100%)
 delete mode 100644 po/fr/LC_MESSAGES/uberwriter.mo
 rename po/{hu/LC_MESSAGES/uberwriter-hu.po => hu.po} (100%)
 delete mode 100644 po/hu/LC_MESSAGES/uberwriter.mo
 rename po/{it/LC_MESSAGES/uberwriter-it.po => it.po} (100%)
 delete mode 100644 po/it/LC_MESSAGES/uberwriter.mo
 create mode 100644 po/meson.build
 rename po/{pl/LC_MESSAGES/uberwriter-pl.po => pl.po} (100%)
 delete mode 100644 po/pl/LC_MESSAGES/uberwriter.mo
 rename po/{pt/LC_MESSAGES/uberwriter-pt.po => pt.po} (100%)
 delete mode 100644 po/pt/LC_MESSAGES/uberwriter.mo
 rename po/{pt_BR/LC_MESSAGES/uberwriter-pt_BR.po => pt_BR.po} (100%)
 delete mode 100644 po/pt_BR/LC_MESSAGES/uberwriter.mo
 rename po/{ru/LC_MESSAGES/uberwriter-ru.po => ru.po} (100%)
 delete mode 100644 po/ru/LC_MESSAGES/uberwriter.mo
 rename po/{si/LC_MESSAGES/uberwriter-si.po => si.po} (100%)
 delete mode 100644 po/si/LC_MESSAGES/uberwriter.mo
 rename po/{sv/LC_MESSAGES/uberwriter-sv.po => sv.po} (100%)
 delete mode 100644 po/sv/LC_MESSAGES/uberwriter.mo
 rename po/{tr/LC_MESSAGES/uberwriter-th.po => th.po} (100%)
 rename po/{tr/LC_MESSAGES/uberwriter-tr.po => tr.po} (100%)
 delete mode 100644 po/tr/LC_MESSAGES/uberwriter.mo
 rename po/{vi/LC_MESSAGES/uberwriter-vi.po => vi.po} (100%)
 delete mode 100644 po/vi/LC_MESSAGES/uberwriter.mo
 rename po/{zh_CN/LC_MESSAGES/uberwriter-zh_CN.po => zh_CN.po} (100%)
 delete mode 100644 po/zh_CN/LC_MESSAGES/uberwriter.mo
 rename po/{zh_TW/LC_MESSAGES/uberwriter-zh_TW.po => zh_TW.po} (100%)
 delete mode 100644 po/zh_TW/LC_MESSAGES/uberwriter.mo

diff --git a/.gitignore b/.gitignore
index 95b6d2f..bae9d6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ build/lib.linux-x86_64-2.7
 *.pyc
 __pycache__/
 build/
+_build/
 debian/uberwriter/DEBIAN
 debian/uberwriter/opt
 debian/uberwriter/usr
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4e6ad1e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-all:
-	python3 ./setup.py build
-
-install:
-	python3 ./setup.py install --prefix=/app --skip-build --optimize=1
-
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 8b13789..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/bin/uberwriter b/bin/uberwriter
deleted file mode 100755
index 69fcd8b..0000000
--- a/bin/uberwriter
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python3
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-### BEGIN LICENSE
-# Copyright (C) 2012, Wolf Vollprecht <w.vollprecht@gmail.com>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
-# by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-# PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-### END LICENSE
-
-### DO NOT EDIT THIS FILE ###
-
-import sys
-import os
-
-import pkg_resources
-
-import gettext
-import locale
-
-# Add project root directory (enable symlink and trunk execution)
-PROJECT_ROOT_DIRECTORY = os.path.abspath(
-    os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
-
-# Set the path if needed. This allows uberwriter to run without installing it :)
-python_path = []
-if os.path.abspath(__file__).startswith('/opt'):
-    gettext.bindtextdomain('uberwriter', '/opt/extras.ubuntu.com/uberwriter/share/locale')
-    syspath = sys.path[:] # copy to avoid infinite loop in pending objects
-    for path in syspath:
-        opt_path = path.replace('/usr', '/opt/extras.ubuntu.com/uberwriter')
-        python_path.insert(0, opt_path)
-        sys.path.insert(0, opt_path)
-    os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/uberwriter/share/", os.getenv("XDG_DATA_DIRS", "/usr/local/share/:/usr/share/")))
-if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'uberwriter'))
-    and PROJECT_ROOT_DIRECTORY not in sys.path):
-    python_path.insert(0, PROJECT_ROOT_DIRECTORY)
-    sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
-if python_path:
-    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
-
-import uberwriter
-
-locale_dir = os.path.abspath(os.path.join(os.path.dirname(uberwriter.__file__),'../po/'))
-
-# L10n
-locale.textdomain('uberwriter')
-locale.bindtextdomain('uberwriter', locale_dir)
-gettext.textdomain('uberwriter')
-gettext.bindtextdomain('uberwriter', locale_dir)
-
-uberwriter.main()
diff --git a/flatpak/de.wolfvollprecht.UberWriter.Plugin.TexLive.appdata.xml b/build-aux/flatpak/de.wolfvollprecht.UberWriter.Plugin.TexLive.appdata.xml
similarity index 86%
rename from flatpak/de.wolfvollprecht.UberWriter.Plugin.TexLive.appdata.xml
rename to build-aux/flatpak/de.wolfvollprecht.UberWriter.Plugin.TexLive.appdata.xml
index d789ef2..ad5ad4b 100644
--- a/flatpak/de.wolfvollprecht.UberWriter.Plugin.TexLive.appdata.xml
+++ b/build-aux/flatpak/de.wolfvollprecht.UberWriter.Plugin.TexLive.appdata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>de.wolfvollprecht.UberWriter.Plugin.TexLive</id>
-  <extends>de.wolfvollprecht.UberWriter.desktop</extends>
+  <extends>de.wolfvollprecht.UberWriter</extends>
   <name>TexLive Plugin</name>
   <summary>Allows to export to pdf and to show formulas in the inline preview</summary>
   <url type="homepage">https://www.tug.org/texlive//</url>
   <project_license>LPPL</project_license>
   <metadata_license>CC0-1.0</metadata_license>
   <update_contact>w.vollprecht_AT_gmail.com</update_contact>
-</component>
\ No newline at end of file
+</component>
diff --git a/build-aux/flatpak/de.wolfvollprecht.UberWriter.json b/build-aux/flatpak/de.wolfvollprecht.UberWriter.json
new file mode 100644
index 0000000..f622a1e
--- /dev/null
+++ b/build-aux/flatpak/de.wolfvollprecht.UberWriter.json
@@ -0,0 +1,102 @@
+{
+    "app-id": "de.wolfvollprecht.UberWriter",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "3.32",
+    "sdk": "org.gnome.Sdk",
+    "command": "uberwriter",
+    "finish-args": [
+        "--socket=x11",
+        "--share=ipc",
+        "--filesystem=host",
+        "--env=IN_FLATPAK=1",
+        "--filesystem=xdg-run/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf",
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+        "--env=XDG_DATA_DIRS=/app/usr/share",
+        "--env=PATH=/app/extensions/TexLive/bin:/app/extensions/TexLive/2018/bin/x86_64-linux:/app/usr/bin:/app/bin"
+    ],
+    "add-extensions": {
+        "de.wolfvollprecht.UberWriter.Plugin": {
+          "directory": "extensions",
+          "version": "stable",
+          "subdirectories": true,
+          "no-autodownload": true,
+          "autodelete": true
+    }
+    },
+    "modules": [{
+        "name": "uberwriter",
+        "buildsystem": "meson",
+        "sources": [{
+            "type" : "git",
+            "url" : "../",
+            "branch" : "refactoring"
+        }],
+		"post-install": [
+			"install -d /app/extensions"
+		]
+	},
+    {
+		"name": "pandoc",
+		"only-arches": [
+		  "x86_64"
+		],
+		"buildsystem": "simple",
+		"build-commands": [
+			"cp bin/pandoc /app/usr/bin/pandoc",
+			"cp bin/pandoc-citeproc /app/usr/bin/pandoc-citeproc"
+		],
+		"sources": [{
+		    "type": "archive",
+		    "url": "https://github.com/jgm/pandoc/releases/download/2.2/pandoc-2.2-linux.tar.gz",
+		    "sha256": "06ecd882e42ef9b7390b1c82e1e71b3ea48679181289b9b810a8797825bed8ed"
+		}]
+    },
+    {
+		"name": "pipdeps",
+     	"buildsystem": "simple",
+      	"build-commands": [
+			"pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} pyenchant regex pypandoc"
+		],
+      	"sources": [{
+			"type": "file",
+          	"url": "https://files.pythonhosted.org/packages/5d/c1/45947333669b31bc6b4933308dd07c2aa2fedcec0a95b14eedae993bd449/wheel-0.31.0.tar.gz",
+          	"sha256": "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce"
+        },
+        {
+			"type": "file",
+			"url": "https://files.pythonhosted.org/packages/ae/e8/2340d46ecadb1692a1e455f13f75e596d4eab3d11a57446f08259dee8f02/pip-10.0.1.tar.gz",
+			"sha256": "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68"
+		},
+        {
+			"type": "file",
+			"url": "https://files.pythonhosted.org/packages/71/81/00184643e5a10a456b4118fc12c96780823adb8ed974eb2289f29703b29b/pypandoc-1.4.tar.gz",
+			"sha256": "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b"
+        },
+        {
+			"type": "file",
+			"url": "https://files.pythonhosted.org/packages/a2/51/c39562cfed3272592c60cfd229e5464d715b78537e332eac2b695422dc49/regex-2018.02.21.tar.gz",
+			"sha256": "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29"
+        },
+        {
+			  "type": "file",
+			  "url": "https://files.pythonhosted.org/packages/9e/54/04d88a59efa33fefb88133ceb638cdf754319030c28aadc5a379d82140ed/pyenchant-2.0.0.tar.gz",
+			  "sha256": "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"
+        }]
+    },
+    {
+	    "name": "fonts",
+        "buildsystem": "simple",
+        "build-commands": [
+          "mkdir -p /app/share/fonts/",
+          "cp ttf/* /app/share/fonts/"
+        ],
+        "sources": [{
+            "type": "git",
+            "url": "https://github.com/mozilla/Fira",
+            "tag": "4.202"
+        }]
+    }
+	]
+}
diff --git a/flatpak/flatpak_gnome_web_photo.json b/build-aux/flatpak/flatpak_gnome_web_photo.json
similarity index 99%
rename from flatpak/flatpak_gnome_web_photo.json
rename to build-aux/flatpak/flatpak_gnome_web_photo.json
index c711f39..1990d45 100644
--- a/flatpak/flatpak_gnome_web_photo.json
+++ b/build-aux/flatpak/flatpak_gnome_web_photo.json
@@ -2,7 +2,7 @@
     "id": "de.wolfvollprecht.UberWriter.Plugin.WebPhoto",
     "runtime": "de.wolfvollprecht.UberWriter",
     "branch": "stable",
-    "sdk": "org.gnome.Sdk//3.26",
+    "sdk": "org.gnome.Sdk//3.32",
     "build-extension": true,
     "separate-locales": false,
     "appstream-compose": false,
diff --git a/flatpak/flatpak_texlive.json b/build-aux/flatpak/flatpak_texlive.json
similarity index 98%
rename from flatpak/flatpak_texlive.json
rename to build-aux/flatpak/flatpak_texlive.json
index 526690e..a403cb8 100644
--- a/flatpak/flatpak_texlive.json
+++ b/build-aux/flatpak/flatpak_texlive.json
@@ -2,7 +2,7 @@
     "id": "de.wolfvollprecht.UberWriter.Plugin.TexLive",
     "runtime": "de.wolfvollprecht.UberWriter",
     "branch": "stable",
-    "sdk": "org.gnome.Sdk//3.26",
+    "sdk": "org.gnome.Sdk//3.32",
     "build-extension": true,
     "separate-locales": false,
     "appstream-compose": false,
diff --git a/flatpak/flatpak_texlive_flathub.json b/build-aux/flatpak/flatpak_texlive_flathub.json
similarity index 98%
rename from flatpak/flatpak_texlive_flathub.json
rename to build-aux/flatpak/flatpak_texlive_flathub.json
index e129688..a0a6823 100644
--- a/flatpak/flatpak_texlive_flathub.json
+++ b/build-aux/flatpak/flatpak_texlive_flathub.json
@@ -2,7 +2,7 @@
     "id": "de.wolfvollprecht.UberWriter.Plugin.TexLive",
     "runtime": "de.wolfvollprecht.UberWriter",
     "branch": "stable",
-    "sdk": "org.gnome.Sdk//3.26",
+    "sdk": "org.gnome.Sdk//3.32",
     "build-extension": true,
     "separate-locales": false,
     "appstream-compose": false,
diff --git a/flatpak/texlive.profile b/build-aux/flatpak/texlive.profile
similarity index 100%
rename from flatpak/texlive.profile
rename to build-aux/flatpak/texlive.profile
diff --git a/flatpak/texlive_install.sh b/build-aux/flatpak/texlive_install.sh
similarity index 100%
rename from flatpak/texlive_install.sh
rename to build-aux/flatpak/texlive_install.sh
diff --git a/build-aux/meson_post_install.py b/build-aux/meson_post_install.py
new file mode 100755
index 0000000..c9cc893
--- /dev/null
+++ b/build-aux/meson_post_install.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+from os import environ, path
+from subprocess import call
+
+if not environ.get('DESTDIR', ''):
+    PREFIX = environ.get('MESON_INSTALL_PREFIX', '/usr/local')
+    DATA_DIR = path.join(PREFIX, 'share')
+    print('Updating icon cache...')
+    call(['gtk-update-icon-cache', '-qtf', path.join(DATA_DIR, 'icons/hicolor')])
+    print("compiling new schemas")
+    call(["glib-compile-schemas", path.join(DATA_DIR, 'glib-2.0/schemas')])
+
diff --git a/configure b/configure
deleted file mode 100755
index 8b13789..0000000
--- a/configure
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/flatpak/de.wolfvollprecht.UberWriter.appdata.xml b/data/de.wolfvollprecht.UberWriter.appdata.xml.in.in
similarity index 96%
rename from flatpak/de.wolfvollprecht.UberWriter.appdata.xml
rename to data/de.wolfvollprecht.UberWriter.appdata.xml.in.in
index ac95924..3f87404 100644
--- a/flatpak/de.wolfvollprecht.UberWriter.appdata.xml
+++ b/data/de.wolfvollprecht.UberWriter.appdata.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>de.wolfvollprecht.UberWriter</id>
-  <launchable type="desktop-id">de.wolfvollprecht.UberWriter.desktop</launchable>
+  <id>@app-id@</id>
+  <launchable type="desktop-id">@app-id@.desktop</launchable>
   <name>UberWriter</name>
   <summary>An elegant, free distraction GTK+ markdown editor</summary>
   <description>
@@ -116,5 +116,5 @@
   <url type="help">http://uberwriter.github.io/uberwriter</url>
   <url type="translate">https://poeditor.com/join/project/gxVzFyXb2x</url>
   <update_contact>manuel.genoves_at_gmail.com</update_contact>
-  <translation type="gettext">uberwriter</translation>
-</component>
\ No newline at end of file
+  <translation type="gettext">@gettext-package@</translation>
+</component>
diff --git a/de.wolfvollprecht.UberWriter.desktop b/data/de.wolfvollprecht.UberWriter.desktop.in.in
similarity index 86%
rename from de.wolfvollprecht.UberWriter.desktop
rename to data/de.wolfvollprecht.UberWriter.desktop.in.in
index 22f4051..306c123 100644
--- a/de.wolfvollprecht.UberWriter.desktop
+++ b/data/de.wolfvollprecht.UberWriter.desktop.in.in
@@ -3,7 +3,7 @@ Name=UberWriter
 Comment=UberWriter, a simple and distraction free Markdown Editor
 Categories=GNOME;GTK;Office;
 Exec=uberwriter %U
-Icon=de.wolfvollprecht.UberWriter
+Icon=@icon@
 Terminal=false
 Type=Application
 MimeType=text/x-markdown;text/plain;
diff --git a/data/media/de.wolfvollprecht.UberWriter-symbolic.svg b/data/icons/de.wolfvollprecht.UberWriter-symbolic.svg
similarity index 100%
rename from data/media/de.wolfvollprecht.UberWriter-symbolic.svg
rename to data/icons/de.wolfvollprecht.UberWriter-symbolic.svg
diff --git a/data/media/de.wolfvollprecht.UberWriter.svg b/data/icons/de.wolfvollprecht.UberWriter.svg
similarity index 100%
rename from data/media/de.wolfvollprecht.UberWriter.svg
rename to data/icons/de.wolfvollprecht.UberWriter.svg
diff --git a/data/icons/meson.build b/data/icons/meson.build
new file mode 100644
index 0000000..a0e51c5
--- /dev/null
+++ b/data/icons/meson.build
@@ -0,0 +1,11 @@
+install_data(
+	'de.wolfvollprecht.UberWriter.svg',
+	install_dir: datadir / 'icons' / 'hicolor' / 'scalable',
+	rename: '@0@.svg'.format(application_id)
+)
+
+install_data(
+	'de.wolfvollprecht.UberWriter-symbolic.svg',
+	install_dir: datadir / 'icons' / 'hicolor' / 'symbolic',
+	rename: '@0@-symbolic.svg'.format(application_id)
+)
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..d414111
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,73 @@
+# FreeDesktop Desktop File
+desktop_conf = configuration_data()
+desktop_conf.set('icon', application_id)
+desktop_file = i18n.merge_file(
+  'desktop',
+  input: configure_file(
+    input: 'de.wolfvollprecht.UberWriter.desktop.in.in',
+    output: '@BASENAME@',
+    configuration: desktop_conf
+  ),
+  output: '@0@.desktop'.format(application_id),
+  po_dir: podir,
+  type: 'desktop',
+  install: true,
+  install_dir: get_option('datadir') / 'applications'
+)
+# Validate Desktop File
+desktop_file_validate = find_program('desktop-file-validate', required: false)
+if desktop_file_validate.found()
+  test (
+    'Validate desktop file',
+    desktop_file_validate,
+    args: desktop_file.full_path()
+  )
+endif
+
+# Freedesktop AppData File
+appdata_conf = configuration_data()
+appdata_conf.set('app-id', application_id)
+appdata_conf.set('gettext-package', gettext_package)
+appdata_file = i18n.merge_file(
+  'appdata',
+  input: configure_file(
+    input: 'de.wolfvollprecht.UberWriter.appdata.xml.in.in',
+    output: '@BASENAME@',
+    configuration: appdata_conf
+  ),
+  output: '@0@.appdata.xml'.format(application_id),
+  po_dir: podir,
+  install: true,
+  install_dir: get_option('datadir') / 'metainfo'
+)
+# Validate AppData File
+appstream_util = find_program('appstream-util', required: false)
+if appstream_util.found()
+  test (
+    'Validate appdata file',
+    appstream_util,
+    args: ['validate-relax', '--nonet', appdata_file.full_path()]
+  )
+endif
+
+# Gschema
+install_data(
+	'de.wolfvollprecht.UberWriter.gschema.xml',
+	install_dir:  get_option('datadir') / 'glib-2.0' / 'schemas',
+	rename: '@0@.gschema.xml'.format(application_id)
+)
+
+subdir('icons')
+
+install_subdir(
+	'lua',
+	install_dir: pkgdatadir
+)
+install_subdir(
+	'media',
+	install_dir: pkgdatadir
+)
+install_subdir(
+	'ui',
+	install_dir: pkgdatadir
+)
diff --git a/flatpak/uberwriter.json b/flatpak/uberwriter.json
deleted file mode 100644
index 620c285..0000000
--- a/flatpak/uberwriter.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-    "app-id": "de.wolfvollprecht.UberWriter",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "3.28",
-    "sdk": "org.gnome.Sdk",
-    "command": "/app/usr/bin/uberwriter",
-    "finish-args": [
-        "--socket=x11",
-        "--share=ipc",
-        "--filesystem=host",
-        "--env=IN_FLATPAK=1",
-        "--filesystem=xdg-run/dconf",
-        "--filesystem=~/.config/dconf:ro",
-        "--talk-name=ca.desrt.dconf",
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
-        "--env=XDG_DATA_DIRS=/app/usr/share",
-        "--env=PATH=/app/extensions/TexLive/bin:/app/extensions/TexLive/2018/bin/x86_64-linux:/app/usr/bin:/app/bin"
-    ],
-    "build-options" : {
-      "env": {
-        "PYTHON": "python3",
-        "IN_FLATPAK": "1"
-        }
-    },
-    "add-extensions": {
-        "de.wolfvollprecht.UberWriter.Plugin": {
-          "directory": "extensions",
-          "version": "stable",
-          "subdirectories": true,
-          "no-autodownload": true,
-          "autodelete": true
-    }
-    },
-    "modules": [
-        {
-        "name": "uberwriter",
-        "sources": [
-                {
-                    "type" : "git",
-                    "url" : "../",
-                    "branch" : "refactoring"
-                }
-            ],
-            "build-commands": [
-                "install -Dm644 flatpak/de.wolfvollprecht.UberWriter.appdata.xml /app/share/appdata/de.wolfvollprecht.UberWriter.appdata.xml "
-            ],
-            "post-install": [
-            "glib-compile-schemas /app/usr/share/glib-2.0/schemas",
-            "install -d /app/extensions"
-            ]
-        },
-        {
-        "name": "pandoc",
-        "only-arches": [
-          "x86_64"
-            ],
-        "buildsystem": "simple",
-        "build-commands": [
-          "cp bin/pandoc /app/usr/bin/pandoc",
-          "cp bin/pandoc-citeproc /app/usr/bin/pandoc-citeproc"
-            ],
-        "sources": [
-                {
-            "type": "archive",
-            "url": "https://github.com/jgm/pandoc/releases/download/2.2/pandoc-2.2-linux.tar.gz",
-            "sha256": "06ecd882e42ef9b7390b1c82e1e71b3ea48679181289b9b810a8797825bed8ed"
-                }
-            ]
-        },
-        {
-          "name": "pipdeps",
-          "buildsystem": "simple",
-          "build-commands": [
-              "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} pyenchant regex pypandoc"
-            ],
-          "sources": [
-                {
-                  "type": "file",
-                  "url": "https://files.pythonhosted.org/packages/5d/c1/45947333669b31bc6b4933308dd07c2aa2fedcec0a95b14eedae993bd449/wheel-0.31.0.tar.gz",
-                  "sha256": "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce"
-        },
-        {
-                  "type": "file",
-                  "url": "https://files.pythonhosted.org/packages/ae/e8/2340d46ecadb1692a1e455f13f75e596d4eab3d11a57446f08259dee8f02/pip-10.0.1.tar.gz",
-                  "sha256": "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68"
-            },
-                {
-                  "type": "file",
-                  "url": "https://files.pythonhosted.org/packages/71/81/00184643e5a10a456b4118fc12c96780823adb8ed974eb2289f29703b29b/pypandoc-1.4.tar.gz",
-                  "sha256": "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b"
-        },
-        {
-                  "type": "file",
-                  "url": "https://files.pythonhosted.org/packages/a2/51/c39562cfed3272592c60cfd229e5464d715b78537e332eac2b695422dc49/regex-2018.02.21.tar.gz",
-                  "sha256": "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29"
-            },
-                {
-                  "type": "file",
-                  "url": "https://files.pythonhosted.org/packages/9e/54/04d88a59efa33fefb88133ceb638cdf754319030c28aadc5a379d82140ed/pyenchant-2.0.0.tar.gz",
-                  "sha256": "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"
-                }
-            ]
-        },
-        {
-        "name": "fonts",
-            "buildsystem": "simple",
-            "build-commands": [
-          "mkdir -p /app/share/fonts/",
-          "cp ttf/* /app/share/fonts/"
-            ],
-            "sources": [
-                {
-            "type": "git",
-            "url": "https://github.com/mozilla/Fira",
-            "tag": "4.202"
-                }
-            ]
-        },
-        {
-            "name": "appdata",
-            "buildsystem": "simple",
-            "build-commands": [
-                "mkdir -p /app/share/appdata",
-                "install -Dm644 de.wolfvollprecht.UberWriter.appdata.xml /app/share/appdata/de.wolfvollprecht.UberWriter.appdata.xml"
-            ],
-            "sources": [
-                {
-                    "type": "file",
-                    "path": "de.wolfvollprecht.UberWriter.appdata.xml"
-                }
-            ]
-        }
-    ]
-    }
diff --git a/po/__init__.py b/help/LINGUAS
similarity index 100%
rename from po/__init__.py
rename to help/LINGUAS
diff --git a/help/meson.build b/help/meson.build
new file mode 100644
index 0000000..1b0c65f
--- /dev/null
+++ b/help/meson.build
@@ -0,0 +1,16 @@
+help_pages = files(
+	'index.page',
+	'pandocs-markdown.page',
+	'preview.page'
+)
+
+help_media = files(
+	'figures/icon.png',
+	'figures/icon_down.png'
+)
+
+gnome.yelp(meson.project_name(),
+    sources: help_pages,
+    media: help_media,
+    symlink_media: true
+)
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..866cb50
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,61 @@
+project(
+  'uberwriter',
+  version: '2.2.0',
+  license: 'GPL2+',
+  meson_version: '>= 0.50.0'
+)
+
+if get_option('profile') == 'development'
+  profile = 'Devel'
+  name_suffix = ' (Development)'
+  vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+  if vcs_tag == ''
+    version_suffix = '-devel'
+  else
+    version_suffix = '-@0@'.format (vcs_tag)
+  endif
+else
+  profile = ''
+  name_suffix = ''
+  version_suffix = ''
+endif
+application_id = 'de.wolfvollprecht.UberWriter@0@'.format(profile)
+
+
+# This doesn't work yet. It's doesn't find the python3 from the sandboxed env first
+# python = import('python')
+# python3 = python.find_installation('python3')
+python = import('python3')
+python3 = python.find_python()
+if not python3.found()
+    error('No valid python3 binary found')
+else
+    message('Found python3 binary')
+endif
+gnome  = import('gnome')
+i18n   = import('i18n')
+
+
+dependency('glib-2.0')
+dependency('gobject-2.0')
+dependency('gobject-introspection-1.0')
+dependency('gtk+-3.0')
+
+find_program('glib-compile-schemas', required: true)
+find_program('gtk-update-icon-cache', required: false)
+find_program('update-desktop-database', required: false)
+
+gettext_package = meson.project_name()
+localedir = get_option('prefix') / get_option('localedir')
+pythondir = get_option('prefix') / python.sysconfig_path('purelib')
+datadir = get_option('prefix') / get_option('datadir')
+pkgdatadir = datadir / meson.project_name()
+podir = meson.source_root() / 'po'
+
+subdir('bin')
+subdir('data')
+subdir('help')
+subdir('po')
+
+meson.add_install_script('build-aux/meson_post_install.py')
+
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..e48ea92
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,9 @@
+option(
+        'profile',
+        type: 'combo',
+        choices: [
+                'default',
+                'development'
+        ],
+        value: 'default'
+)
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..e0cc5c1
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,21 @@
+ca
+ca_ES
+cs
+de
+en_GB
+es
+eu
+fr
+hu
+it
+pl
+pt
+pt_BR
+ru
+si
+sv
+th
+tr
+vi
+zh_CN
+zh_TW
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..e69de29
diff --git a/po/ca/LC_MESSAGES/uberwriter-ca.po b/po/ca.po
similarity index 100%
rename from po/ca/LC_MESSAGES/uberwriter-ca.po
rename to po/ca.po
diff --git a/po/ca/LC_MESSAGES/uberwriter.mo b/po/ca/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index cde1c5d93035674c71d789082feaed375daaeaff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5856
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
PG9toRISm?3stNuNhvQAE

diff --git a/po/ca_ES/LC_MESSAGES/uberwriter-ca_ES.po b/po/ca_ES.po
similarity index 100%
rename from po/ca_ES/LC_MESSAGES/uberwriter-ca_ES.po
rename to po/ca_ES.po
diff --git a/po/ca_ES/LC_MESSAGES/uberwriter.mo b/po/ca_ES/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index c9a5e1e6b6e57d89d079d3c925cac55efb8e99c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12808
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

diff --git a/po/compile_translations.sh b/po/compile_translations.sh
deleted file mode 100755
index 8ad5524..0000000
--- a/po/compile_translations.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-find . -name \*.po -execdir sh -c 'msgfmt "$0" -o uberwriter.mo' '{}' \; 
-
diff --git a/po/cs/LC_MESSAGES/uberwriter-cs.po b/po/cs.po
similarity index 100%
rename from po/cs/LC_MESSAGES/uberwriter-cs.po
rename to po/cs.po
diff --git a/po/cs/LC_MESSAGES/uberwriter.mo b/po/cs/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index c63c29fbbe500c1f88bf5d1580c02b76da3c8666..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 996
zcmY+BOK%e~5XTLa*YXf*c?lt5_0$TvB)L#6;!ygaL2VPYDWKk*-63(a*um>;o1%&<
z2avdMs5qb;5aLkr3Fsx{1MmUh$frPpzuQy|BhCIiGxp5i>tDk|?-}eO{3iSjd<6an
z?rr`UW0$}pcokd&&w($%0Ne&ogRlGXJMb*x58yTMQ@{QV^yhluW$*`h9sCWR0{?;|
zetn#=VZ=91z(E1}`aJ0KrG8umy=K*qH^EzoUx8lF$38!UR}g;%y`CQE`~3tlZhw6S
zM7VE5`1<oF;r@Py=CwoG{!E`c5BK-H-~(@C+VHeht5NEd(djswieo<da(k3J!)H|F
zv(mQNbX{5*IkIWU=2}UTMwUpkd6KcxHCC)?V~I~C30si5){<z*N=?#yLFoopnm?gx
z)tZfzEGt{e6m77Tqqz*_R5{`*<ua2hk=29-liIk!g0V4#l&x8($cbVs9zz+VhJ3Y3
z_K8I+8!S`PSSJ?Knu^7PRxK436Y`*3s)%Vz(qB!?NJk+r<nogupBII@ypRtI`P;dC
zE{Ba`8A^TM{=Q&ArcP9>)M+A}vFLVqT~Q(Vd>{^alm?5%#n~fi`H5UGZL}ke9_=RP
zI@)x1nu%2U9*^*cQ*!rLD|2G<XrG_;jI5Z|k@3Ge<daq9f~VpkX|e|*%7$X)cwwRt
zu(94=w-f8`7p}XV%+}lEtlZmCv2+K|%40luVlv&`ZM4{$mW_7EmL!iTF)ePYR&JRL
zl_eQBReJESCd28h*CF;uZnYb2R&tc}cDlQco46sjc*dL7)RXRRZ;!seRcxu-sV5YB
edI@aB*=|QSBwr`YPhG1CasOpC4dfwDhU_1L6a%dQ

diff --git a/po/de/LC_MESSAGES/uberwriter-de.po b/po/de.po
similarity index 100%
rename from po/de/LC_MESSAGES/uberwriter-de.po
rename to po/de.po
diff --git a/po/de/LC_MESSAGES/uberwriter.mo b/po/de/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index 879ce1e3728de6e273920ec0b754527fb12dcab4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12603
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

diff --git a/po/en_GB/LC_MESSAGES/uberwriter-en_GB.po b/po/en_GB.po
similarity index 100%
rename from po/en_GB/LC_MESSAGES/uberwriter-en_GB.po
rename to po/en_GB.po
diff --git a/po/en_GB/LC_MESSAGES/uberwriter.mo b/po/en_GB/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index a981e71f709999c136fc74e0e75ee0587d8c0d96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7518
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

diff --git a/po/es/LC_MESSAGES/uberwriter-es.po b/po/es.po
similarity index 100%
rename from po/es/LC_MESSAGES/uberwriter-es.po
rename to po/es.po
diff --git a/po/es/LC_MESSAGES/uberwriter.mo b/po/es/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index be6d2fdc43c3fa75ce220b0c7b5fe6b4f3def3fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11556
zcma)>dypJQea9PQY!Ji*19n2d8H9}`qB|pjiF}rY&v$y9(c`Q;S$^QGXLtK<N1B~k
z&&=NG<TxfIfdt2ZiJb&v9)e&DvO*DsBE=)Pbg6=n${#?Aq$tV+D3iECDv&Z%NRg_1
zzTG{$r#tbOy57%BPj^rEuYbQ^|GMvqi_Uw{aD9yQQd0UXW4;4FyPhAeJr^4D%Ww+*
z3cM9w3`_Vz_%^r^z7O(ezQB*(e+@nx{wKT${s^j_=RDt+dkNJ0P4IlUHRN9npUd+e
z_)0hnH^aN&i{PX1#qe`b^}h<A1HS=Z0>2yh3_iA<=a<4)z+0fo-5vN=sCMp$8tO+N
zRn1>P_2&$v%jWOlFTsBa{4TtJ=cl3S{Uq>$7x-~r6nHtjg!kLvd2kx4-9u3I-v}j_
zcHko9&%BKvnlukX_2(4ScRmNz|1So91^znE-w4k?fs*_AG^+2t46cJ4pz6Oea0`^2
zwnMdd80tGQRQWrh>i41ge;i&0-vu=<pMvV&GJGEVC#Z7Yf|ApZq1w9u<<RpbP<nDX
zKbp_0p}unmRQ)y_gLlH);bZUyxSq+r1|EVt;r&qa{m)SS_*W=7eh+G%o`$!<bxi6T
zU<2y?NvQItp~m%jsCND?@E@V-e+|-g^CXlU|0g^@p9j6)05#4n5K)^c_*!@y+zQ_b
z^}S{IGWZV=Q!-CM$^XBg<nq5z{aH_A+?tD_+8cqY_j;)Ex5KMp2dZBmglhkj5D}Tr
zLACc~$k5HVp!)G6sP;BttOwvVQ1fsv{8jjFsPd;Ff98w)NH4zyFNgmQr5_hkID(s?
z-roQ<o*SY1aX36T0xgt$kA~+SRQn6z`5l1|LXGb|;rS7$aXbcJ13wF;C*Ke6FQGH~
z{>z~HeOchuP;%H0CC4V@&nyK#01<`xIMn+u1U><2+WZiz{_}s$xBCjnl$&i(_4bGS
zxxl+Z{yU-Cdlb@y`8-s6Ux%`br=jNeSvXVa?F-=R;9>X_d^^-QjxpJ?-}|8IpMv`C
z7vQVlH=+8o{!*_O5tQEUfRgKOsQJ1B%0Ax$_1%+D<vtbi9}oFYhUXu^t9XAgAD3S3
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
J4<(Y^{6FrLUMBzm

diff --git a/po/eu/LC_MESSAGES/uberwriter-eu.po b/po/eu.po
similarity index 100%
rename from po/eu/LC_MESSAGES/uberwriter-eu.po
rename to po/eu.po
diff --git a/po/eu/LC_MESSAGES/uberwriter.mo b/po/eu/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index eb93e3b4f14c44388d1c1c51c6acccce79f29746..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5713
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
O%ArvK{Ch)msec0+tQjHz

diff --git a/po/fr/LC_MESSAGES/uberwriter-fr.po b/po/fr.po
similarity index 100%
rename from po/fr/LC_MESSAGES/uberwriter-fr.po
rename to po/fr.po
diff --git a/po/fr/LC_MESSAGES/uberwriter.mo b/po/fr/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index be52b3d6dca5c3acd9e317fb39acf3bf01a6b7bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11168
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

diff --git a/po/hu/LC_MESSAGES/uberwriter-hu.po b/po/hu.po
similarity index 100%
rename from po/hu/LC_MESSAGES/uberwriter-hu.po
rename to po/hu.po
diff --git a/po/hu/LC_MESSAGES/uberwriter.mo b/po/hu/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index 5c9bd78454033c0396449c189df96847bfe91cfe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3880
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

diff --git a/po/it/LC_MESSAGES/uberwriter-it.po b/po/it.po
similarity index 100%
rename from po/it/LC_MESSAGES/uberwriter-it.po
rename to po/it.po
diff --git a/po/it/LC_MESSAGES/uberwriter.mo b/po/it/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index e592e5558e844a210bffbf649059f375bcacd782..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12843
zcmeI2e~=|rb;moh3XFh&X#BN!U4)(0nOPP@*I`+FJ3F&GFuOC%djqUShMxC&-n84V
z`_bKRW@r6@BtjG=Q3(<R6~#nCuu84OSV^Vw!^Bj9#*nJ~vQn!_8G~gdR+6eHF~)qp
z_ultoXI4o0PyVrM&wTsdzCX`7_ndRj+Y{$+xhLRx6nYu-wr2;yKY@Qg#2=paIYDs$
zvx49j@LbAgpBDr#0xtw#2)+({K6n@$2A4pZ2JiLXKMbBh`Lp2p;O~MO=PRJvo$%lP
z1$++W|Mc}g1fNU!EIM5Rz6cxvuLdsw6YvG#ZJ@@#7d#Vu5PS*vh{rz#_fY-@coDdj
z#j0J!<F%m1Spc==qu}$vRZ#1>1JpY20?!5?@c0OLI^{2b>i35p9|xH#_-l{f27i|F
ze}h}V3s}6yeKDy122}fDk5__hJva=CPd9^F&n@5@cpIqso&vRxEi7Jm4)}8LMZUZn
zlzjGqn)e8J8h8_^{!1QPp!jtR)Hrv8n(rf^+J72U|IdQj$LGOUf`1N5KK}t~oj(H4
z0?%bqwc84cUsr${Z^D<WAgl;NP;%{nn&$yf{T~F!!B2y42A>440jC)BO7H{VB={9j
za(_O`sCB#y6hDVS$?H<^P2knwwc!2!`#*zf|6Ne~`T?kMf)_hH6IB26LCNJ6AWH~d
z<IC6j?>B+kXA6|PZU<ij-V0s^ei_tyegtj>Plw4It>9u%{C_nlzPuLHdZs|lGY@LK
z7*xNvf@*&s_<Hb@pw@K))cF4fil0w`8t?3vy7RFW)H*H$HC_bHf@`4U@@F7R3;qg3
zm4ferup-!k5s-dv1uq6)2{LqW4QRl~f4>9Ne(nObj=O#Nevcmq#otf)@}r=}|C}#B
z?(qpw`}-ST{zp*zcoMuE{5~i>8G#v^uL^2?M?kInW{(|Ee7F-7A3q9e-M{VeFF?ub
zJO2A=7rJ&Y0mX-1p!#16YTQK-l@3Z!{qFSjpYZrQzW&Rg=KCh7`F;Ruyccp9buKOi
zCEp4-2_6Dp3*HTW8+;6uef=%t=9|MviBHR*`ris_UGE2F|2_%ooIC*{vfu<L{rxXc
z{Z8X>8t`QvuLAY`CQx!}g3|8{6yM(g8t^^fRp29__WvZf9sD6EyKphep!PdK>C-r<
zb<Kc#z?(sq5PSrb{Qk(}6QKC`51{&g4-~(ig;2Gg7lRt_6`=NexySwf`vRzay&2TH
zS3!+`J7~arK#li#a0~bq@HyaLg5uNPfg1l?9={JtK0|Cy>v|<<_XA!{c?ML!_kr5?
zeI6eIQN`fXp!z)qYF*y|HSbg4v%&uXwazWWj*rg=QMq6k)c&VHeZLMo4ZImt{|1Qa
z1Tn}E!Mj1N<1?Vv_xqsu^HorK_6<<y_y@lJ%pFe8UII!lE&*Q!?gKSX3sn1Cz}?`j
z-~#vsQ2RcI#;*qtgVKX{gJ*zW0*An_f@gwX1En9|1Q)@lK#h0g)o%U|f?DrKLGj}=
zzW(!|`v0;2{$)`5a{`q7{@s_)9C7n*1+~vhK+RVHuLQ3L_kte;&jOzSQK{ersQI>x
zy7dl$;@1m6wYvn=e3ygT*8x!co&$%#47?UR4yxUkz~_Qr1787t3zXc?7<2k_A@~}~
zyFs;Yfz#k^zWg{SJ^MPSeLMw9UoP0`^nMiNUvLF~^gRN%f$s#*1|I^&ug`*7@9%-y
z-=Bcb0Uz`Dgs=ZwP~)HQ<?s3LKlJrmE_M6a3d(=%0AX3M2c$_5gBt%nQ1g8Z)cg<o
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
MAQ}Z7{RGqh0?}>AMF0Q*

diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 0000000..368265d
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1,2 @@
+i18n.gettext(gettext_package, preset: 'glib')
+
diff --git a/po/pl/LC_MESSAGES/uberwriter-pl.po b/po/pl.po
similarity index 100%
rename from po/pl/LC_MESSAGES/uberwriter-pl.po
rename to po/pl.po
diff --git a/po/pl/LC_MESSAGES/uberwriter.mo b/po/pl/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index e7493c7b9a221d2d65b7f75e604d337bfe3bb5df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4447
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
Z&w>gGE*eWEgd}Ob+tn$mHu+ww{{hg7>2Cl4

diff --git a/po/pt/LC_MESSAGES/uberwriter-pt.po b/po/pt.po
similarity index 100%
rename from po/pt/LC_MESSAGES/uberwriter-pt.po
rename to po/pt.po
diff --git a/po/pt/LC_MESSAGES/uberwriter.mo b/po/pt/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index 6034db125a6ef98b689630b9f02eb3122aa71c8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4720
zcmZvfOKc=Z8OMtxybL6eKp;Fq;e@O=oA%nyYvXK|Y`p8;1$*u6%#t7;QB8NvOtC#(
zLsz%G4ulH|x#a{xLI{Y06eWsJz#+N89Jp}_+#-+=5-$lU<N$&L{J!cQ+nc53?tf2p
zb=CLyf8W3TyBn|juHtxr^W&U<e4A1m;LF!?;rR1)O1&Ta3-}T6-{8&QO>gG}?*!+-
z6QGO_z;}V)1m6KZ1HK1*7Q6%eK6n@S3-E*B-@y-o*D_h=-@;`E)GZ!q$L|B*$@oLy
z2f)*y*!37F^M~NO!O-GUpxE;a_)+kO?f5I;4g8*f9|m7*fBy|!=J$WVFN627ne6u+
zE?)$H0Dcbq7byOn;&MH>-r|?Qd-#0`TmpX#egb?A#6|T6D0co6l>M*4Sc%Jxp!jnu
zDB}yDy#H`J9ze;*)1bubx1i+VuOOzXYgzQu;0&n21yI&`6qNN1_%t~kffBDb8T=%8
z-Fut(+z!gR4}x>xCMb6Afc&ZNalvHu6HwOM1!dkV;N9RKK(YVk_ciOzfinLr$RqVA
zC~^7<DE5v(iE9PQd*1-Xu4h4+|D*Q#%OHR1XIyRpe+e#vuY<Uvu4hr<%`M=kz@wn>
z@lo&;Xu%=)5-9PwiOUn<ZQy6YZ-KJ@uR&Sobx`*I2e=CU7yJykig9;<-v*=qAfZ>U
zfc&Wm7qRCzpzQy9@MGYcpv30}oRskuunRs03LjqvB@e#>WxYRv_kwSLhrmNOHg<1-
zETx_RNu!$Ol>CTI^PCB%91<frj&MpmgcDN2lxy6dWn&(s&gD4FDLiA@y+i6jj%yl-
zbt<`%xM<E}oN`DU<RC=R*W2T-#_n6&dx`1v5IzXU?&K8i$Z=Z(@w&iOI4#FL4aAx`
z+TIIqBnA?v``fYmK&fx(S&~PIsl;!Qb9zW#B*u~lHCK2Y>cPN<%K0K3R>ylM9&x?g
z`9W#M!yUcqa(nz}?}R)!V+&iFTyKoy<mvF)?)utW$2vPjWiIQX8w_*K$`u2duIFU(
zU3$%Q?c;~l$t=^eUw>*=S6-iTsjO<s9ktTw#C_F@DN>uOm7yt3TG=uzbMJky+UV&d
zT@6j8cYLk4O;O28b+G%>QlI;hId)`qpSy6iVQM9pCAVEQ^mU~>W(#Z8iXV+kk>#$i
z`hxA-(qfA`eR=H5O0D{|4tm{ZR;|`~9@5g<Ld8JbtIk@J$qHwu&g)R^<W}p0Bhd_X
zZczBr>XUh{)=V*|4T(@|E>zl8cBIx#dFhnjE;NR3=EfDeYcE&oyw@XBr9(EsCtnr5
z66fk7<54*>xqH&8^Yy4_OWm<CtU+yzZK2m(aY?hxW46~T{dTZrGj8<!C`%;QY7?h@
zs#8;FQ&*miTx#-shb=EzJ)0ykTSn)e-7^!0niup4H`Hcs4S{q;sCYvk8rDS^+dMxc
z_8&6seYThA5HmvRN}adf>wf7+k}e&5zuGngC$$BspI4iu-Ewvt^jV$S00&~gWB!LG
zXsAqdY*|3j%;IiF${Z8t#2Pn};6`I(I>OM}ir?(uiZrh?n;ljc?8t91tCH9TojY94
zeBC2^VQgemp-^)N>%`8U9k`;9RQNt7jiG8R9R-gpHf=XI(aRX%j?Mde#Zw<pD^s1J
z-^SctJ<uZ?LNszN+1hHxg09Kpb_pHICvw-*CJ+8_^OA>|J=kX}J@yXnn?AGf&|_CA
zX*N3KF0+9xRA+i8?v|7T2ITGgL3Kt3T6ZdPX~?YQwj@tl7?{C8)!A<ns%s=5xGP?;
zPEZ$%fVY`WhvX3oUxWs;Aucfsahf$EF{llBb9NkQw*N4`(iBizqjALOA#X&lvdDFA
zDe*RASLEr6tO_M<Wtd3O3x|E7AblW?+L84w<8txh;2?23_`sJL{pJfa7O4e!Xp88$
zWW6K2)+<AsUJ`D~tYMSyN;jd132);uuk2_HMXAe7S5m^nM(QWtL+GzkrOCN0`8+)i
zQ<o29eddCdmXoZ9fy<Id>On}lep%0KZgi8C(ni;kQ>L=ZdTC+tShBd7EZwh{7MGV6
zk1Q-MEHE*-K;_7~|7YIP^4$+K^VUqLl5S~=kekYv%X-shrKcU1bhDw+$1fI_pmT9z
zX4<Nft~Dd(VO~9`Ejd3vt{%?aye|j)vzGO^npr=$etO@##rcJqmODvzXN>6*h@)d^
zaSsZK%3!O9E_PRwWBc>OGTLx*x=6kB*JXXI=c<{<lQmNp>2Pear0LH4Ufz=|Jdi9d
z>4k;m#ib()987Oitntv>%vE}6erZO{1v?TcL<uK9w~Z36x^!qALCCD$Q^meBQ{~$j
zPhOD8`V6}0!d1h<=jq@n7B*k2=_f{as8(}1>grXB=+dZyjV_v~iwsPjE1g$+_8@+(
zIGU21Mjb75Jsl7{lI3-OYP$%f>^m+k#fm3&;HBxrnr>@HMm$XE;UP9KUZ-p9nHw5&
z)vA@$XbIGrk`gNEmt<t}5^XlFfV{9bOCg?8->qCS5vhz(L^v5u%gOUHXH4(%Q`ziJ
zcB?w~Dh4WLANeN9J+iqsGBqU1CNsJ<dz{N0y9IR)KV<J5`7{TlvyP$(k)7-p)cMKt
z2n8f6s?s1}QrcX36Jasq$%_&QA~E(NAeFq)iYk5}r)|oae}3}n$d*2+lfBZF`m7t<
zlCK@Z47Nay&eIYGCi7)GV=sSqBDYhe9rG2TF$H$ZK4qh^``Rm=8X+N3!^v(R5f|mf
z1Ny29isI9Kv*pXXVtX~xm~keuD3T^zp~Lk79Y!5$qt_<8^5M})SA`oSN+h>o{ZxfT
zekU&`w2@jqFNj2x;U_g_#jY)+XhgT6LzrqY@>>yCdTwYmxZn}39G1qQw^<Gnve?!q
zyUd<SF}ZMoiK!pqGRix7LENjye6nep?%oj5cEx0u;*m^Z6+%3D4khk;b*83=5m+<u
zrD=W<C3sx(nb}mhI?1<A)H4UA);;~17YMxwG8VHY-qmHB+g6}uKv!neo4hz;!7HWu
z@ZK_F4Qz{+k>Iplg!tP*O~fhJTH-A^&YT&0WXf$}hRlUMROP;Aqh4anfobR92ecEK
zh#Qli76dC6fGD><Ejmn@q2R<?+LZ{n&D%odt;wtSd@|?bK`fJgR!BBr1z{r@D6s@%
zD&w;(BP-5oa=vAs6npj`w!+@L(-v$)k$a<}<73M9lNU@r6c+P)T6gm8)Np{H98COG
zY+*yx9pfmz4t;~H7e-&OF)~uQlie+wzx7e{Ds%hKH%)G~N<-g_O`-1{i3%aUjGp&g
z?kYSNV$czg482iS{AV<Ij_&H`)k(+aQX4E9B7B6ZR0w205Y2fd>ejYYNof0<=oNMl
GbMrs0nJ@7G

diff --git a/po/pt_BR/LC_MESSAGES/uberwriter-pt_BR.po b/po/pt_BR.po
similarity index 100%
rename from po/pt_BR/LC_MESSAGES/uberwriter-pt_BR.po
rename to po/pt_BR.po
diff --git a/po/pt_BR/LC_MESSAGES/uberwriter.mo b/po/pt_BR/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index a5b567013add85d61242a2017d58d137d4e03928..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4622
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

diff --git a/po/ru/LC_MESSAGES/uberwriter-ru.po b/po/ru.po
similarity index 100%
rename from po/ru/LC_MESSAGES/uberwriter-ru.po
rename to po/ru.po
diff --git a/po/ru/LC_MESSAGES/uberwriter.mo b/po/ru/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index eb1c3383d2cc94756a4ad710a124e25fa5443b18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5860
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
WB&96Sapr)F^R!W`LA*P}nEwEWEG(%2

diff --git a/po/si/LC_MESSAGES/uberwriter-si.po b/po/si.po
similarity index 100%
rename from po/si/LC_MESSAGES/uberwriter-si.po
rename to po/si.po
diff --git a/po/si/LC_MESSAGES/uberwriter.mo b/po/si/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index 0ad6d571ac23a046f590dc19d9241a09b90e32c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6846
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

diff --git a/po/sv/LC_MESSAGES/uberwriter-sv.po b/po/sv.po
similarity index 100%
rename from po/sv/LC_MESSAGES/uberwriter-sv.po
rename to po/sv.po
diff --git a/po/sv/LC_MESSAGES/uberwriter.mo b/po/sv/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index 5f3a8aa64452252bc82347867943bfe4c065961c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4799
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

diff --git a/po/tr/LC_MESSAGES/uberwriter-th.po b/po/th.po
similarity index 100%
rename from po/tr/LC_MESSAGES/uberwriter-th.po
rename to po/th.po
diff --git a/po/tr/LC_MESSAGES/uberwriter-tr.po b/po/tr.po
similarity index 100%
rename from po/tr/LC_MESSAGES/uberwriter-tr.po
rename to po/tr.po
diff --git a/po/tr/LC_MESSAGES/uberwriter.mo b/po/tr/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index a3f1ef77bb07ee17ef7ad1ef8dcb9e4e967be947..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 793
zcmYk3&1(}u7{*7fA6*rs78R88(u*xJZFUbDA|BeNN+F@4rbdsG?6{8E&V-psHHtU?
z0S|iZQ3Nl!^dPy&=I@Yt_2^yjnSRi`@bKe(_t|IO-T5^$^_iijp*v6tU4_0wp$?#H
z&~NAl^cRYt=`%;~%z`)3&w-c0``|3N3f=-+;B}}6T|xix?2-Qy7;?XX7r-Cj9QYFq
zyBvTs;2-cd_zy(Hq4y$q9tw313jRx>IWAb))Je0T4Y_`nN#~W(Zjr5|Db2tCFi+l4
zRdvEt*a6$fw6T&_@|@L#&iVpxu+5&-R8zW3N>fX=+t$2s(z2(gfed4(yd>pF><X2O
zb}lD}+W3hF4QpP@j^`UGe<rQN;T76$OWU%@u+f(68S8o7Wh&*X{mk*EsZi9|Z1OcL
zMOc<sg_jjdN^zOTF;5;)5?7M=UMVh>VB}kJSB2bTUsMy$^QINr<-!|_w3F}SO(}LJ
z`U-g))i>(vr>n(FrD)A)FEug-J)G<1Tff}Ph0+hH^GaAJ{iE&XV_rV>g|l8t%hz?s
zq)KNMDz}x7p7SSCOMA3L!^l*5N|us{Efo8hD;k*YB0IdAyNX<~|1K{^<2^~Ti$B^d
zMmxnw7bALMx=svORpmLZVpWXya-scrI2aGf3oF3Rc$f+j#aC8*3DLobd!lerP7#8f
TP=0dM?dM1t4|B1DBxBis|B%}t

diff --git a/po/vi/LC_MESSAGES/uberwriter-vi.po b/po/vi.po
similarity index 100%
rename from po/vi/LC_MESSAGES/uberwriter-vi.po
rename to po/vi.po
diff --git a/po/vi/LC_MESSAGES/uberwriter.mo b/po/vi/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index 3de221cc8c71404cf9d6ed92790c07fbaf6ce04c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 627
zcmYk2ziSjh6vs!6qAQ{(Xe07SsZ8A6#$&}IUSc@hBS+jA+qvE6-XxcqWA@$Yp;i{w
z7M7wC1b=~zRTe>5J8N5E{{a60JKuVd<iTgY%*=Pb?=ip5&b<&^$C!&u%$#H%Gfll?
z&NJ^BkNL)&V16(cn4e7J|IM5`B*Y)qCg;>)Ax^ViW<A3iv0h@m&3c@5la=k_DAV*l
zSaW+Dw*0Fj&AOOnF#qVuJdlMYoszajxvA*n#yW(>;ZVfN<YSd%Ay!9dAl7CJw1Exm
z_nm!Epc8k-IbSzV3(<3S6H}6%Ox{IT@L2@weRLa66FP4VN7j+-7P-#k&2e7H#75xt
zRukEFsG1D9qzEGj{h%d-K!(>K45Bc&;s?IZM!AL)-Q@21yjT?^6Q@iuRAe2e{hwGS
zsJ0L6BbaEf+vzUvj}|QWUfUW%!x_^N_a%HtS4Tso&2>lz$`wdA){|SZweM?s-A5;v
zO=>f3@(5aeP2N4Zf(G4eh@Qnv6NC$)Cz3(+VSDz=lj^kvs>_e?{kg8or$)qe`I1j|
z-x8$t?v7|zZ&EOM^~La7m!CzqE?>=lot!l}kgGnK0c7K8T|OhRQkOd#s;}ZNE99_I

diff --git a/po/zh_CN/LC_MESSAGES/uberwriter-zh_CN.po b/po/zh_CN.po
similarity index 100%
rename from po/zh_CN/LC_MESSAGES/uberwriter-zh_CN.po
rename to po/zh_CN.po
diff --git a/po/zh_CN/LC_MESSAGES/uberwriter.mo b/po/zh_CN/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index 539a52923cda5095c965907c33dacc1729db2ef2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3973
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
bUhk%J8rVz{&LVldl<|Jz<3cE09b^9mYu8ME

diff --git a/po/zh_TW/LC_MESSAGES/uberwriter-zh_TW.po b/po/zh_TW.po
similarity index 100%
rename from po/zh_TW/LC_MESSAGES/uberwriter-zh_TW.po
rename to po/zh_TW.po
diff --git a/po/zh_TW/LC_MESSAGES/uberwriter.mo b/po/zh_TW/LC_MESSAGES/uberwriter.mo
deleted file mode 100644
index a57168a19de458601d00934fe183d958bc217f87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4302
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
DymPz2