From 47fa6ec3a1c4aa3c58ee75d932fe237ddb133518 Mon Sep 17 00:00:00 2001
From: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
Date: Thu, 12 Aug 2021 11:31:44 +0200
Subject: [PATCH 1/3] Fix language config

---
 src/Application.vala |  5 +++++
 src/Config.vala.in   |  2 ++
 src/meson.build      | 10 ++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 src/Config.vala.in

diff --git a/src/Application.vala b/src/Application.vala
index e740190..cf586e4 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -67,6 +67,11 @@ public class Application : Gtk.Application {
     }
 
     protected override void activate () {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        GLib.Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+        GLib.Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        GLib.Intl.textdomain (GETTEXT_PACKAGE);
+
         var granite_settings = Granite.Settings.get_default ();
         var gtk_settings = Gtk.Settings.get_default ();
 
diff --git a/src/Config.vala.in b/src/Config.vala.in
new file mode 100644
index 0000000..a3c7bd4
--- /dev/null
+++ b/src/Config.vala.in
@@ -0,0 +1,2 @@
+public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
+public const string LOCALEDIR = @LOCALEDIR@;
\ No newline at end of file
diff --git a/src/meson.build b/src/meson.build
index e2530f2..515ba3e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,3 +1,12 @@
+config_data = configuration_data()
+config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
+config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+config_file = configure_file(
+    input: 'Config.vala.in',
+    output: '@BASENAME@',
+    configuration: config_data
+)
+
 sources = [
     'Config/Constants.vala',
     'Controllers/TypewriterController.vala',
@@ -11,6 +20,7 @@ sources = [
 executable(
     meson.project_name(),
     sources + ['Application.vala'],
+    config_file,
     dependencies: dependencies,
     install: true
 )

From 57a78418fb20a82a18907bc13b6c6c0b7fd8254f Mon Sep 17 00:00:00 2001
From: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
Date: Tue, 2 Nov 2021 06:27:44 +0000
Subject: [PATCH 2/3] Try

---
 .gitignore                                    |   2 +
 .vscode/tasks.json                            |  17 ++
 app                                           |  11 ++
 meson.build                                   |   2 +-
 po/POTFILES                                   |   2 +-
 po/com.github.manexim.typewriter.pot          |  36 ++--
 po/de.po                                      |  40 ++---
 po/es.po                                      |  40 ++---
 po/extra/de.po                                | 148 ++++++++++++++++-
 po/extra/extra.pot                            | 148 ++++++++++++++++-
 po/extra/fr.po                                | 153 ++++++++++++++++-
 po/extra/it.po                                | 153 ++++++++++++++++-
 po/extra/nl.po                                | 156 +++++++++++++++++-
 po/fr.po                                      |  40 ++---
 po/it.po                                      |  40 ++---
 po/nl.po                                      |  44 ++---
 src/Application.vala                          |  14 +-
 src/Config.vala.in                            |   2 -
 .../Constants.vala => Constants.vala.in}      |  25 ++-
 src/MainWindow.vala                           |  16 +-
 src/Models/Typewriter.vala                    |   6 +-
 src/Services/Settings.vala                    |   2 +-
 src/Views/TypewriterView.vala                 |   6 +-
 src/meson.build                               |  10 +-
 24 files changed, 928 insertions(+), 185 deletions(-)
 create mode 100644 .vscode/tasks.json
 create mode 100755 app
 delete mode 100644 src/Config.vala.in
 rename src/{Config/Constants.vala => Constants.vala.in} (51%)

diff --git a/.gitignore b/.gitignore
index 8aba8c9..042b334 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 build
 build-dir
 .flatpak-builder
+repo
+*.flatpak
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..6390f23
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,17 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build & Run",
+            "type": "shell",
+            "command": "./app",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/app b/app
new file mode 100755
index 0000000..e6fcfdd
--- /dev/null
+++ b/app
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# fail on first error
+set -e
+
+APP=com.github.manexim.typewriter
+
+flatpak-builder --repo=repo build ${APP}.yml --force-clean
+flatpak build-bundle repo ${APP}.flatpak --runtime-repo=https://flatpak.elementary.io/repo.flatpakrepo ${APP} master
+flatpak install --user -y ${APP}.flatpak
+flatpak run ${APP}
diff --git a/meson.build b/meson.build
index e2b26c3..364cb13 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('com.github.manexim.typewriter', 'vala', 'c')
+project('com.github.manexim.typewriter', 'vala', 'c', version: '0.5.0')
 
 # Include the translations module
 i18n = import('i18n')
diff --git a/po/POTFILES b/po/POTFILES
index 6a3cffd..8a5f5b8 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,7 +1,7 @@
-src/Config/Constants.vala
 src/Controllers/TypewriterController.vala
 src/Models/Typewriter.vala
 src/Services/Settings.vala
 src/Views/TypewriterView.vala
 src/Application.vala
+src/Constants.vala.in
 src/MainWindow.vala
diff --git a/po/com.github.manexim.typewriter.pot b/po/com.github.manexim.typewriter.pot
index 72fc079..dae7cf9 100644
--- a/po/com.github.manexim.typewriter.pot
+++ b/po/com.github.manexim.typewriter.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-27 20:40+0200\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Views/TypewriterView.vala:63 src/MainWindow.vala:168
-#, c-format
-msgid "%u characters"
+#: src/Constants.vala.in:33
+msgid "Zoom out"
 msgstr ""
 
-#: src/Views/TypewriterView.vala:64 src/MainWindow.vala:169
-#, c-format
-msgid "%u words"
+#: src/Constants.vala.in:34
+msgid "Default zoom level"
 msgstr ""
 
-#: src/Views/TypewriterView.vala:65 src/MainWindow.vala:170
-#, c-format
-msgid "%u min read"
+#: src/Constants.vala.in:35
+msgid "Zoom in"
 msgstr ""
 
-#: src/MainWindow.vala:95
-msgid "Zoom out"
+#: src/Constants.vala.in:37
+msgid "Menu"
 msgstr ""
 
-#: src/MainWindow.vala:103
-msgid "Default zoom level"
+#: src/Constants.vala.in:39
+#, c-format
+msgid "%u characters"
 msgstr ""
 
-#: src/MainWindow.vala:115
-msgid "Zoom in"
+#: src/Constants.vala.in:40
+#, c-format
+msgid "%u words"
 msgstr ""
 
-#: src/MainWindow.vala:142
-msgid "Menu"
+#: src/Constants.vala.in:41
+#, c-format
+msgid "%u min read"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 7f2f2e5..4729d5b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-27 20:40+0200\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-02-08 13:43+0100\n"
 "Last-Translator: Marius Meisenzahl <mariusmeisenzahl@gmail.com>\n"
 "Language-Team: none\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/Views/TypewriterView.vala:63 src/MainWindow.vala:168
-#, c-format
-msgid "%u characters"
-msgstr "%u Zeichen"
-
-#: src/Views/TypewriterView.vala:64 src/MainWindow.vala:169
-#, c-format
-msgid "%u words"
-msgstr "%u Wörter"
-
-#: src/Views/TypewriterView.vala:65 src/MainWindow.vala:170
-#, c-format
-msgid "%u min read"
-msgstr "Lesezeit: %u Min."
-
-#: src/MainWindow.vala:95
+#: src/Constants.vala.in:33
 msgid "Zoom out"
 msgstr "Verkleinern"
 
-#: src/MainWindow.vala:103
+#: src/Constants.vala.in:34
 msgid "Default zoom level"
 msgstr "Standard Zoomfaktor"
 
-#: src/MainWindow.vala:115
+#: src/Constants.vala.in:35
 msgid "Zoom in"
 msgstr "Vergrößern"
 
-#: src/MainWindow.vala:142
+#: src/Constants.vala.in:37
 msgid "Menu"
 msgstr "Menü"
+
+#: src/Constants.vala.in:39
+#, c-format
+msgid "%u characters"
+msgstr "%u Zeichen"
+
+#: src/Constants.vala.in:40
+#, c-format
+msgid "%u words"
+msgstr "%u Wörter"
+
+#: src/Constants.vala.in:41
+#, c-format
+msgid "%u min read"
+msgstr "Lesezeit: %u Min."
diff --git a/po/es.po b/po/es.po
index 8fcf21b..f0a18d1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-27 20:40+0200\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-05-16 08:50-0500\n"
 "Last-Translator: Alejandro Elí <@onerbs>\n"
 "Language-Team: none\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/Views/TypewriterView.vala:63 src/MainWindow.vala:168
-#, c-format
-msgid "%u characters"
-msgstr "%u carácteres"
-
-#: src/Views/TypewriterView.vala:64 src/MainWindow.vala:169
-#, c-format
-msgid "%u words"
-msgstr "%u palabras"
-
-#: src/Views/TypewriterView.vala:65 src/MainWindow.vala:170
-#, c-format
-msgid "%u min read"
-msgstr "Lectura de %u minutos"
-
-#: src/MainWindow.vala:95
+#: src/Constants.vala.in:33
 msgid "Zoom out"
 msgstr ""
 
-#: src/MainWindow.vala:103
+#: src/Constants.vala.in:34
 msgid "Default zoom level"
 msgstr ""
 
-#: src/MainWindow.vala:115
+#: src/Constants.vala.in:35
 msgid "Zoom in"
 msgstr ""
 
-#: src/MainWindow.vala:142
+#: src/Constants.vala.in:37
 msgid "Menu"
 msgstr ""
+
+#: src/Constants.vala.in:39
+#, c-format
+msgid "%u characters"
+msgstr "%u carácteres"
+
+#: src/Constants.vala.in:40
+#, c-format
+msgid "%u words"
+msgstr "%u palabras"
+
+#: src/Constants.vala.in:41
+#, c-format
+msgid "%u min read"
+msgstr "Lectura de %u minutos"
diff --git a/po/extra/de.po b/po/extra/de.po
index fa50335..5a866ad 100644
--- a/po/extra/de.po
+++ b/po/extra/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-08 13:58+0100\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-02-08 13:54+0100\n"
 "Last-Translator: Marius Meisenzahl <mariusmeisenzahl@gmail.com>\n"
 "Language-Team: none\n"
@@ -33,22 +33,160 @@ msgid "Get lost in typing and don't worry about losing your precious work."
 msgstr ""
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:21
-msgid "Use bottom bar instead of overlay"
+#: data/com.github.manexim.typewriter.appdata.xml.in:45
+#: data/com.github.manexim.typewriter.appdata.xml.in:68
+#: data/com.github.manexim.typewriter.appdata.xml.in:91
+#: data/com.github.manexim.typewriter.appdata.xml.in:113
+#: data/com.github.manexim.typewriter.appdata.xml.in:137
+#: data/com.github.manexim.typewriter.appdata.xml.in:158
+#: data/com.github.manexim.typewriter.appdata.xml.in:179
+msgid "New:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:23
+msgid "Using Hdy.Window for rounded corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:24
+msgid "Support dark style preference"
 msgstr ""
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:48
+#: data/com.github.manexim.typewriter.appdata.xml.in:71
+#: data/com.github.manexim.typewriter.appdata.xml.in:94
+#: data/com.github.manexim.typewriter.appdata.xml.in:119
+#: data/com.github.manexim.typewriter.appdata.xml.in:141
+#: data/com.github.manexim.typewriter.appdata.xml.in:161
+#: data/com.github.manexim.typewriter.appdata.xml.in:183
+msgid "Improved:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:29
+#: data/com.github.manexim.typewriter.appdata.xml.in:51
+#: data/com.github.manexim.typewriter.appdata.xml.in:75
+#: data/com.github.manexim.typewriter.appdata.xml.in:98
+#: data/com.github.manexim.typewriter.appdata.xml.in:123
+#: data/com.github.manexim.typewriter.appdata.xml.in:144
+#: data/com.github.manexim.typewriter.appdata.xml.in:165
+#: data/com.github.manexim.typewriter.appdata.xml.in:186
+msgid "Fixed:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:32
+#: data/com.github.manexim.typewriter.appdata.xml.in:55
+#: data/com.github.manexim.typewriter.appdata.xml.in:78
+#: data/com.github.manexim.typewriter.appdata.xml.in:101
+#: data/com.github.manexim.typewriter.appdata.xml.in:126
+#: data/com.github.manexim.typewriter.appdata.xml.in:147
+#: data/com.github.manexim.typewriter.appdata.xml.in:168
+#: data/com.github.manexim.typewriter.appdata.xml.in:189
+msgid "Translations:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:34
+#: data/com.github.manexim.typewriter.appdata.xml.in:57
+#: data/com.github.manexim.typewriter.appdata.xml.in:80
+#: data/com.github.manexim.typewriter.appdata.xml.in:103
+#: data/com.github.manexim.typewriter.appdata.xml.in:128
+#: data/com.github.manexim.typewriter.appdata.xml.in:149
+#: data/com.github.manexim.typewriter.appdata.xml.in:170
+#: data/com.github.manexim.typewriter.appdata.xml.in:191
+msgid "French (by NathanBnm)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:35
+#: data/com.github.manexim.typewriter.appdata.xml.in:58
+#: data/com.github.manexim.typewriter.appdata.xml.in:81
+#: data/com.github.manexim.typewriter.appdata.xml.in:104
+#: data/com.github.manexim.typewriter.appdata.xml.in:129
+#: data/com.github.manexim.typewriter.appdata.xml.in:150
+#: data/com.github.manexim.typewriter.appdata.xml.in:171
+#: data/com.github.manexim.typewriter.appdata.xml.in:192
+msgid "German (by meisenzahl)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:59
+#: data/com.github.manexim.typewriter.appdata.xml.in:82
+#: data/com.github.manexim.typewriter.appdata.xml.in:105
+#: data/com.github.manexim.typewriter.appdata.xml.in:130
+#: data/com.github.manexim.typewriter.appdata.xml.in:151
+#: data/com.github.manexim.typewriter.appdata.xml.in:172
+msgid "Italian (by mirkobrombin)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:37
+#: data/com.github.manexim.typewriter.appdata.xml.in:60
+#: data/com.github.manexim.typewriter.appdata.xml.in:83
+#: data/com.github.manexim.typewriter.appdata.xml.in:106
+#: data/com.github.manexim.typewriter.appdata.xml.in:131
+#: data/com.github.manexim.typewriter.appdata.xml.in:152
+#: data/com.github.manexim.typewriter.appdata.xml.in:173
+msgid "Spanish (by onerbs)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:38
+#: data/com.github.manexim.typewriter.appdata.xml.in:61
+#: data/com.github.manexim.typewriter.appdata.xml.in:84
+#: data/com.github.manexim.typewriter.appdata.xml.in:107
+msgid "Dutch (by Vistaus)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:39
+#: data/com.github.manexim.typewriter.appdata.xml.in:62
+#: data/com.github.manexim.typewriter.appdata.xml.in:85
+msgid "Russian (by logdimov)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:53
+msgid "Fix typo in name of translator"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:73
+#: data/com.github.manexim.typewriter.appdata.xml.in:96
+#: data/com.github.manexim.typewriter.appdata.xml.in:121
+#: data/com.github.manexim.typewriter.appdata.xml.in:163
+msgid "Update translations"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:115
+msgid "Respect an OS-wide dark preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:116
+msgid "Add actions"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:117
+msgid "Add audio feedback if zoom is not possible"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:139
+msgid "Add rounded window corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:181
+msgid "Add menu to set zoom level"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:198
+msgid "Use bottom bar instead of overlay"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:203
 msgid "Update icon branding"
 msgstr ""
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:31
+#: data/com.github.manexim.typewriter.appdata.xml.in:208
 msgid "Update icon"
 msgstr ""
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:213
 msgid "Initial release"
 msgstr ""
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:46
+#: data/com.github.manexim.typewriter.appdata.xml.in:243
 msgid "Manexim"
 msgstr ""
 
diff --git a/po/extra/extra.pot b/po/extra/extra.pot
index 33fe4ff..00ea620 100644
--- a/po/extra/extra.pot
+++ b/po/extra/extra.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-08 13:58+0100\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,22 +33,160 @@ msgid "Get lost in typing and don't worry about losing your precious work."
 msgstr ""
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:21
-msgid "Use bottom bar instead of overlay"
+#: data/com.github.manexim.typewriter.appdata.xml.in:45
+#: data/com.github.manexim.typewriter.appdata.xml.in:68
+#: data/com.github.manexim.typewriter.appdata.xml.in:91
+#: data/com.github.manexim.typewriter.appdata.xml.in:113
+#: data/com.github.manexim.typewriter.appdata.xml.in:137
+#: data/com.github.manexim.typewriter.appdata.xml.in:158
+#: data/com.github.manexim.typewriter.appdata.xml.in:179
+msgid "New:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:23
+msgid "Using Hdy.Window for rounded corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:24
+msgid "Support dark style preference"
 msgstr ""
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:48
+#: data/com.github.manexim.typewriter.appdata.xml.in:71
+#: data/com.github.manexim.typewriter.appdata.xml.in:94
+#: data/com.github.manexim.typewriter.appdata.xml.in:119
+#: data/com.github.manexim.typewriter.appdata.xml.in:141
+#: data/com.github.manexim.typewriter.appdata.xml.in:161
+#: data/com.github.manexim.typewriter.appdata.xml.in:183
+msgid "Improved:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:29
+#: data/com.github.manexim.typewriter.appdata.xml.in:51
+#: data/com.github.manexim.typewriter.appdata.xml.in:75
+#: data/com.github.manexim.typewriter.appdata.xml.in:98
+#: data/com.github.manexim.typewriter.appdata.xml.in:123
+#: data/com.github.manexim.typewriter.appdata.xml.in:144
+#: data/com.github.manexim.typewriter.appdata.xml.in:165
+#: data/com.github.manexim.typewriter.appdata.xml.in:186
+msgid "Fixed:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:32
+#: data/com.github.manexim.typewriter.appdata.xml.in:55
+#: data/com.github.manexim.typewriter.appdata.xml.in:78
+#: data/com.github.manexim.typewriter.appdata.xml.in:101
+#: data/com.github.manexim.typewriter.appdata.xml.in:126
+#: data/com.github.manexim.typewriter.appdata.xml.in:147
+#: data/com.github.manexim.typewriter.appdata.xml.in:168
+#: data/com.github.manexim.typewriter.appdata.xml.in:189
+msgid "Translations:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:34
+#: data/com.github.manexim.typewriter.appdata.xml.in:57
+#: data/com.github.manexim.typewriter.appdata.xml.in:80
+#: data/com.github.manexim.typewriter.appdata.xml.in:103
+#: data/com.github.manexim.typewriter.appdata.xml.in:128
+#: data/com.github.manexim.typewriter.appdata.xml.in:149
+#: data/com.github.manexim.typewriter.appdata.xml.in:170
+#: data/com.github.manexim.typewriter.appdata.xml.in:191
+msgid "French (by NathanBnm)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:35
+#: data/com.github.manexim.typewriter.appdata.xml.in:58
+#: data/com.github.manexim.typewriter.appdata.xml.in:81
+#: data/com.github.manexim.typewriter.appdata.xml.in:104
+#: data/com.github.manexim.typewriter.appdata.xml.in:129
+#: data/com.github.manexim.typewriter.appdata.xml.in:150
+#: data/com.github.manexim.typewriter.appdata.xml.in:171
+#: data/com.github.manexim.typewriter.appdata.xml.in:192
+msgid "German (by meisenzahl)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:59
+#: data/com.github.manexim.typewriter.appdata.xml.in:82
+#: data/com.github.manexim.typewriter.appdata.xml.in:105
+#: data/com.github.manexim.typewriter.appdata.xml.in:130
+#: data/com.github.manexim.typewriter.appdata.xml.in:151
+#: data/com.github.manexim.typewriter.appdata.xml.in:172
+msgid "Italian (by mirkobrombin)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:37
+#: data/com.github.manexim.typewriter.appdata.xml.in:60
+#: data/com.github.manexim.typewriter.appdata.xml.in:83
+#: data/com.github.manexim.typewriter.appdata.xml.in:106
+#: data/com.github.manexim.typewriter.appdata.xml.in:131
+#: data/com.github.manexim.typewriter.appdata.xml.in:152
+#: data/com.github.manexim.typewriter.appdata.xml.in:173
+msgid "Spanish (by onerbs)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:38
+#: data/com.github.manexim.typewriter.appdata.xml.in:61
+#: data/com.github.manexim.typewriter.appdata.xml.in:84
+#: data/com.github.manexim.typewriter.appdata.xml.in:107
+msgid "Dutch (by Vistaus)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:39
+#: data/com.github.manexim.typewriter.appdata.xml.in:62
+#: data/com.github.manexim.typewriter.appdata.xml.in:85
+msgid "Russian (by logdimov)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:53
+msgid "Fix typo in name of translator"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:73
+#: data/com.github.manexim.typewriter.appdata.xml.in:96
+#: data/com.github.manexim.typewriter.appdata.xml.in:121
+#: data/com.github.manexim.typewriter.appdata.xml.in:163
+msgid "Update translations"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:115
+msgid "Respect an OS-wide dark preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:116
+msgid "Add actions"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:117
+msgid "Add audio feedback if zoom is not possible"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:139
+msgid "Add rounded window corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:181
+msgid "Add menu to set zoom level"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:198
+msgid "Use bottom bar instead of overlay"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:203
 msgid "Update icon branding"
 msgstr ""
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:31
+#: data/com.github.manexim.typewriter.appdata.xml.in:208
 msgid "Update icon"
 msgstr ""
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:213
 msgid "Initial release"
 msgstr ""
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:46
+#: data/com.github.manexim.typewriter.appdata.xml.in:243
 msgid "Manexim"
 msgstr ""
 
diff --git a/po/extra/fr.po b/po/extra/fr.po
index 242ba46..8ffd97f 100644
--- a/po/extra/fr.po
+++ b/po/extra/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-11 08:46+0100\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-02-11 08:46+0100\n"
 "Last-Translator: Nathan Bonnemains (@NathanBnm)\n"
 "Language-Team: none\n"
@@ -30,25 +30,166 @@ msgstr "Un éditeur de texte minimaliste avec sauvegarde automatique"
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:10
 msgid "Get lost in typing and don't worry about losing your precious work."
-msgstr "Perdez-vous dans la dactylographie et ne craignez pas de perdre votre précieux travail."
+msgstr ""
+"Perdez-vous dans la dactylographie et ne craignez pas de perdre votre "
+"précieux travail."
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:21
+#: data/com.github.manexim.typewriter.appdata.xml.in:45
+#: data/com.github.manexim.typewriter.appdata.xml.in:68
+#: data/com.github.manexim.typewriter.appdata.xml.in:91
+#: data/com.github.manexim.typewriter.appdata.xml.in:113
+#: data/com.github.manexim.typewriter.appdata.xml.in:137
+#: data/com.github.manexim.typewriter.appdata.xml.in:158
+#: data/com.github.manexim.typewriter.appdata.xml.in:179
+msgid "New:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:23
+msgid "Using Hdy.Window for rounded corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:24
+msgid "Support dark style preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:48
+#: data/com.github.manexim.typewriter.appdata.xml.in:71
+#: data/com.github.manexim.typewriter.appdata.xml.in:94
+#: data/com.github.manexim.typewriter.appdata.xml.in:119
+#: data/com.github.manexim.typewriter.appdata.xml.in:141
+#: data/com.github.manexim.typewriter.appdata.xml.in:161
+#: data/com.github.manexim.typewriter.appdata.xml.in:183
+msgid "Improved:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:29
+#: data/com.github.manexim.typewriter.appdata.xml.in:51
+#: data/com.github.manexim.typewriter.appdata.xml.in:75
+#: data/com.github.manexim.typewriter.appdata.xml.in:98
+#: data/com.github.manexim.typewriter.appdata.xml.in:123
+#: data/com.github.manexim.typewriter.appdata.xml.in:144
+#: data/com.github.manexim.typewriter.appdata.xml.in:165
+#: data/com.github.manexim.typewriter.appdata.xml.in:186
+msgid "Fixed:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:32
+#: data/com.github.manexim.typewriter.appdata.xml.in:55
+#: data/com.github.manexim.typewriter.appdata.xml.in:78
+#: data/com.github.manexim.typewriter.appdata.xml.in:101
+#: data/com.github.manexim.typewriter.appdata.xml.in:126
+#: data/com.github.manexim.typewriter.appdata.xml.in:147
+#: data/com.github.manexim.typewriter.appdata.xml.in:168
+#: data/com.github.manexim.typewriter.appdata.xml.in:189
+msgid "Translations:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:34
+#: data/com.github.manexim.typewriter.appdata.xml.in:57
+#: data/com.github.manexim.typewriter.appdata.xml.in:80
+#: data/com.github.manexim.typewriter.appdata.xml.in:103
+#: data/com.github.manexim.typewriter.appdata.xml.in:128
+#: data/com.github.manexim.typewriter.appdata.xml.in:149
+#: data/com.github.manexim.typewriter.appdata.xml.in:170
+#: data/com.github.manexim.typewriter.appdata.xml.in:191
+msgid "French (by NathanBnm)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:35
+#: data/com.github.manexim.typewriter.appdata.xml.in:58
+#: data/com.github.manexim.typewriter.appdata.xml.in:81
+#: data/com.github.manexim.typewriter.appdata.xml.in:104
+#: data/com.github.manexim.typewriter.appdata.xml.in:129
+#: data/com.github.manexim.typewriter.appdata.xml.in:150
+#: data/com.github.manexim.typewriter.appdata.xml.in:171
+#: data/com.github.manexim.typewriter.appdata.xml.in:192
+msgid "German (by meisenzahl)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:59
+#: data/com.github.manexim.typewriter.appdata.xml.in:82
+#: data/com.github.manexim.typewriter.appdata.xml.in:105
+#: data/com.github.manexim.typewriter.appdata.xml.in:130
+#: data/com.github.manexim.typewriter.appdata.xml.in:151
+#: data/com.github.manexim.typewriter.appdata.xml.in:172
+msgid "Italian (by mirkobrombin)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:37
+#: data/com.github.manexim.typewriter.appdata.xml.in:60
+#: data/com.github.manexim.typewriter.appdata.xml.in:83
+#: data/com.github.manexim.typewriter.appdata.xml.in:106
+#: data/com.github.manexim.typewriter.appdata.xml.in:131
+#: data/com.github.manexim.typewriter.appdata.xml.in:152
+#: data/com.github.manexim.typewriter.appdata.xml.in:173
+msgid "Spanish (by onerbs)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:38
+#: data/com.github.manexim.typewriter.appdata.xml.in:61
+#: data/com.github.manexim.typewriter.appdata.xml.in:84
+#: data/com.github.manexim.typewriter.appdata.xml.in:107
+msgid "Dutch (by Vistaus)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:39
+#: data/com.github.manexim.typewriter.appdata.xml.in:62
+#: data/com.github.manexim.typewriter.appdata.xml.in:85
+msgid "Russian (by logdimov)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:53
+msgid "Fix typo in name of translator"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:73
+#: data/com.github.manexim.typewriter.appdata.xml.in:96
+#: data/com.github.manexim.typewriter.appdata.xml.in:121
+#: data/com.github.manexim.typewriter.appdata.xml.in:163
+#, fuzzy
+msgid "Update translations"
+msgstr "Mise à jour de l'icône"
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:115
+msgid "Respect an OS-wide dark preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:116
+msgid "Add actions"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:117
+msgid "Add audio feedback if zoom is not possible"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:139
+msgid "Add rounded window corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:181
+msgid "Add menu to set zoom level"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:198
 msgid "Use bottom bar instead of overlay"
 msgstr "Utilisation de la barre inférieure au lieu d'un overlay"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:203
 msgid "Update icon branding"
 msgstr "Mise à jour du style de l'icône"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:31
+#: data/com.github.manexim.typewriter.appdata.xml.in:208
 msgid "Update icon"
 msgstr "Mise à jour de l'icône"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:213
 msgid "Initial release"
 msgstr "Version initiale"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:46
+#: data/com.github.manexim.typewriter.appdata.xml.in:243
 msgid "Manexim"
 msgstr "Manexim"
 
diff --git a/po/extra/it.po b/po/extra/it.po
index b26bdfe..3e21d15 100644
--- a/po/extra/it.po
+++ b/po/extra/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-26 16:38+0000\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-04-26 16:47+0200\n"
 "Last-Translator: Mirko Brombin <send@mirko.pm>\n"
 "Language-Team: Italian\n"
@@ -31,25 +31,166 @@ msgstr "Una applicazione minimale per la scrittura con auto salvataggio"
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:10
 msgid "Get lost in typing and don't worry about losing your precious work."
-msgstr "Perditi nella scrittura e non preoccuparti più di perdere la concentrazione sul lavoro."
+msgstr ""
+"Perditi nella scrittura e non preoccuparti più di perdere la concentrazione "
+"sul lavoro."
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:21
+#: data/com.github.manexim.typewriter.appdata.xml.in:45
+#: data/com.github.manexim.typewriter.appdata.xml.in:68
+#: data/com.github.manexim.typewriter.appdata.xml.in:91
+#: data/com.github.manexim.typewriter.appdata.xml.in:113
+#: data/com.github.manexim.typewriter.appdata.xml.in:137
+#: data/com.github.manexim.typewriter.appdata.xml.in:158
+#: data/com.github.manexim.typewriter.appdata.xml.in:179
+msgid "New:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:23
+msgid "Using Hdy.Window for rounded corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:24
+msgid "Support dark style preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:48
+#: data/com.github.manexim.typewriter.appdata.xml.in:71
+#: data/com.github.manexim.typewriter.appdata.xml.in:94
+#: data/com.github.manexim.typewriter.appdata.xml.in:119
+#: data/com.github.manexim.typewriter.appdata.xml.in:141
+#: data/com.github.manexim.typewriter.appdata.xml.in:161
+#: data/com.github.manexim.typewriter.appdata.xml.in:183
+msgid "Improved:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:29
+#: data/com.github.manexim.typewriter.appdata.xml.in:51
+#: data/com.github.manexim.typewriter.appdata.xml.in:75
+#: data/com.github.manexim.typewriter.appdata.xml.in:98
+#: data/com.github.manexim.typewriter.appdata.xml.in:123
+#: data/com.github.manexim.typewriter.appdata.xml.in:144
+#: data/com.github.manexim.typewriter.appdata.xml.in:165
+#: data/com.github.manexim.typewriter.appdata.xml.in:186
+msgid "Fixed:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:32
+#: data/com.github.manexim.typewriter.appdata.xml.in:55
+#: data/com.github.manexim.typewriter.appdata.xml.in:78
+#: data/com.github.manexim.typewriter.appdata.xml.in:101
+#: data/com.github.manexim.typewriter.appdata.xml.in:126
+#: data/com.github.manexim.typewriter.appdata.xml.in:147
+#: data/com.github.manexim.typewriter.appdata.xml.in:168
+#: data/com.github.manexim.typewriter.appdata.xml.in:189
+msgid "Translations:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:34
+#: data/com.github.manexim.typewriter.appdata.xml.in:57
+#: data/com.github.manexim.typewriter.appdata.xml.in:80
+#: data/com.github.manexim.typewriter.appdata.xml.in:103
+#: data/com.github.manexim.typewriter.appdata.xml.in:128
+#: data/com.github.manexim.typewriter.appdata.xml.in:149
+#: data/com.github.manexim.typewriter.appdata.xml.in:170
+#: data/com.github.manexim.typewriter.appdata.xml.in:191
+msgid "French (by NathanBnm)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:35
+#: data/com.github.manexim.typewriter.appdata.xml.in:58
+#: data/com.github.manexim.typewriter.appdata.xml.in:81
+#: data/com.github.manexim.typewriter.appdata.xml.in:104
+#: data/com.github.manexim.typewriter.appdata.xml.in:129
+#: data/com.github.manexim.typewriter.appdata.xml.in:150
+#: data/com.github.manexim.typewriter.appdata.xml.in:171
+#: data/com.github.manexim.typewriter.appdata.xml.in:192
+msgid "German (by meisenzahl)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:59
+#: data/com.github.manexim.typewriter.appdata.xml.in:82
+#: data/com.github.manexim.typewriter.appdata.xml.in:105
+#: data/com.github.manexim.typewriter.appdata.xml.in:130
+#: data/com.github.manexim.typewriter.appdata.xml.in:151
+#: data/com.github.manexim.typewriter.appdata.xml.in:172
+msgid "Italian (by mirkobrombin)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:37
+#: data/com.github.manexim.typewriter.appdata.xml.in:60
+#: data/com.github.manexim.typewriter.appdata.xml.in:83
+#: data/com.github.manexim.typewriter.appdata.xml.in:106
+#: data/com.github.manexim.typewriter.appdata.xml.in:131
+#: data/com.github.manexim.typewriter.appdata.xml.in:152
+#: data/com.github.manexim.typewriter.appdata.xml.in:173
+msgid "Spanish (by onerbs)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:38
+#: data/com.github.manexim.typewriter.appdata.xml.in:61
+#: data/com.github.manexim.typewriter.appdata.xml.in:84
+#: data/com.github.manexim.typewriter.appdata.xml.in:107
+msgid "Dutch (by Vistaus)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:39
+#: data/com.github.manexim.typewriter.appdata.xml.in:62
+#: data/com.github.manexim.typewriter.appdata.xml.in:85
+msgid "Russian (by logdimov)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:53
+msgid "Fix typo in name of translator"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:73
+#: data/com.github.manexim.typewriter.appdata.xml.in:96
+#: data/com.github.manexim.typewriter.appdata.xml.in:121
+#: data/com.github.manexim.typewriter.appdata.xml.in:163
+#, fuzzy
+msgid "Update translations"
+msgstr "Aggiornata l'icona"
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:115
+msgid "Respect an OS-wide dark preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:116
+msgid "Add actions"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:117
+msgid "Add audio feedback if zoom is not possible"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:139
+msgid "Add rounded window corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:181
+msgid "Add menu to set zoom level"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:198
 msgid "Use bottom bar instead of overlay"
 msgstr "Usa la barra sotto anzichè l'overlay"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:203
 msgid "Update icon branding"
 msgstr "Aggiornato l'icona del brand"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:31
+#: data/com.github.manexim.typewriter.appdata.xml.in:208
 msgid "Update icon"
 msgstr "Aggiornata l'icona"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:213
 msgid "Initial release"
 msgstr "Versione iniziale"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:46
+#: data/com.github.manexim.typewriter.appdata.xml.in:243
 msgid "Manexim"
 msgstr "Manexim"
 
diff --git a/po/extra/nl.po b/po/extra/nl.po
index 2f2380b..037f7d9 100644
--- a/po/extra/nl.po
+++ b/po/extra/nl.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-08 13:58+0100\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-09-01 18:16+0200\n"
+"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Language-Team: \n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.4.1\n"
-"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: nl\n"
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:7
 #: data/com.github.manexim.typewriter.desktop.in:4
@@ -31,25 +31,165 @@ msgstr "Een minimale tekstbewerker die alles automatisch opslaat"
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:10
 msgid "Get lost in typing and don't worry about losing your precious work."
-msgstr "Typ tekst en vergeet alles om je heen - je werk wordt automatisch opgeslagen."
+msgstr ""
+"Typ tekst en vergeet alles om je heen - je werk wordt automatisch opgeslagen."
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:21
+#: data/com.github.manexim.typewriter.appdata.xml.in:45
+#: data/com.github.manexim.typewriter.appdata.xml.in:68
+#: data/com.github.manexim.typewriter.appdata.xml.in:91
+#: data/com.github.manexim.typewriter.appdata.xml.in:113
+#: data/com.github.manexim.typewriter.appdata.xml.in:137
+#: data/com.github.manexim.typewriter.appdata.xml.in:158
+#: data/com.github.manexim.typewriter.appdata.xml.in:179
+msgid "New:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:23
+msgid "Using Hdy.Window for rounded corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:24
+msgid "Support dark style preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:48
+#: data/com.github.manexim.typewriter.appdata.xml.in:71
+#: data/com.github.manexim.typewriter.appdata.xml.in:94
+#: data/com.github.manexim.typewriter.appdata.xml.in:119
+#: data/com.github.manexim.typewriter.appdata.xml.in:141
+#: data/com.github.manexim.typewriter.appdata.xml.in:161
+#: data/com.github.manexim.typewriter.appdata.xml.in:183
+msgid "Improved:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:29
+#: data/com.github.manexim.typewriter.appdata.xml.in:51
+#: data/com.github.manexim.typewriter.appdata.xml.in:75
+#: data/com.github.manexim.typewriter.appdata.xml.in:98
+#: data/com.github.manexim.typewriter.appdata.xml.in:123
+#: data/com.github.manexim.typewriter.appdata.xml.in:144
+#: data/com.github.manexim.typewriter.appdata.xml.in:165
+#: data/com.github.manexim.typewriter.appdata.xml.in:186
+msgid "Fixed:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:32
+#: data/com.github.manexim.typewriter.appdata.xml.in:55
+#: data/com.github.manexim.typewriter.appdata.xml.in:78
+#: data/com.github.manexim.typewriter.appdata.xml.in:101
+#: data/com.github.manexim.typewriter.appdata.xml.in:126
+#: data/com.github.manexim.typewriter.appdata.xml.in:147
+#: data/com.github.manexim.typewriter.appdata.xml.in:168
+#: data/com.github.manexim.typewriter.appdata.xml.in:189
+msgid "Translations:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:34
+#: data/com.github.manexim.typewriter.appdata.xml.in:57
+#: data/com.github.manexim.typewriter.appdata.xml.in:80
+#: data/com.github.manexim.typewriter.appdata.xml.in:103
+#: data/com.github.manexim.typewriter.appdata.xml.in:128
+#: data/com.github.manexim.typewriter.appdata.xml.in:149
+#: data/com.github.manexim.typewriter.appdata.xml.in:170
+#: data/com.github.manexim.typewriter.appdata.xml.in:191
+msgid "French (by NathanBnm)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:35
+#: data/com.github.manexim.typewriter.appdata.xml.in:58
+#: data/com.github.manexim.typewriter.appdata.xml.in:81
+#: data/com.github.manexim.typewriter.appdata.xml.in:104
+#: data/com.github.manexim.typewriter.appdata.xml.in:129
+#: data/com.github.manexim.typewriter.appdata.xml.in:150
+#: data/com.github.manexim.typewriter.appdata.xml.in:171
+#: data/com.github.manexim.typewriter.appdata.xml.in:192
+msgid "German (by meisenzahl)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:59
+#: data/com.github.manexim.typewriter.appdata.xml.in:82
+#: data/com.github.manexim.typewriter.appdata.xml.in:105
+#: data/com.github.manexim.typewriter.appdata.xml.in:130
+#: data/com.github.manexim.typewriter.appdata.xml.in:151
+#: data/com.github.manexim.typewriter.appdata.xml.in:172
+msgid "Italian (by mirkobrombin)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:37
+#: data/com.github.manexim.typewriter.appdata.xml.in:60
+#: data/com.github.manexim.typewriter.appdata.xml.in:83
+#: data/com.github.manexim.typewriter.appdata.xml.in:106
+#: data/com.github.manexim.typewriter.appdata.xml.in:131
+#: data/com.github.manexim.typewriter.appdata.xml.in:152
+#: data/com.github.manexim.typewriter.appdata.xml.in:173
+msgid "Spanish (by onerbs)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:38
+#: data/com.github.manexim.typewriter.appdata.xml.in:61
+#: data/com.github.manexim.typewriter.appdata.xml.in:84
+#: data/com.github.manexim.typewriter.appdata.xml.in:107
+msgid "Dutch (by Vistaus)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:39
+#: data/com.github.manexim.typewriter.appdata.xml.in:62
+#: data/com.github.manexim.typewriter.appdata.xml.in:85
+msgid "Russian (by logdimov)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:53
+msgid "Fix typo in name of translator"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:73
+#: data/com.github.manexim.typewriter.appdata.xml.in:96
+#: data/com.github.manexim.typewriter.appdata.xml.in:121
+#: data/com.github.manexim.typewriter.appdata.xml.in:163
+#, fuzzy
+msgid "Update translations"
+msgstr "Pictogram bijgewerkt"
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:115
+msgid "Respect an OS-wide dark preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:116
+msgid "Add actions"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:117
+msgid "Add audio feedback if zoom is not possible"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:139
+msgid "Add rounded window corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:181
+msgid "Add menu to set zoom level"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:198
 msgid "Use bottom bar instead of overlay"
 msgstr "Statusbalk in plaats van een zwevende balk"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:203
 msgid "Update icon branding"
 msgstr "Pictogram bijgewerkt"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:31
+#: data/com.github.manexim.typewriter.appdata.xml.in:208
 msgid "Update icon"
 msgstr "Pictogram bijgewerkt"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:213
 msgid "Initial release"
 msgstr "Initiële uitgave"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:46
+#: data/com.github.manexim.typewriter.appdata.xml.in:243
 msgid "Manexim"
 msgstr "Manexim"
 
diff --git a/po/fr.po b/po/fr.po
index b0085f8..3b73f0e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-27 20:40+0200\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-02-11 08:46+0100\n"
 "Last-Translator: Nathan Bonnemains (@NathanBnm)\n"
 "Language-Team: none\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/Views/TypewriterView.vala:63 src/MainWindow.vala:168
-#, c-format
-msgid "%u characters"
-msgstr "%u caractères"
-
-#: src/Views/TypewriterView.vala:64 src/MainWindow.vala:169
-#, c-format
-msgid "%u words"
-msgstr "%u mots"
-
-#: src/Views/TypewriterView.vala:65 src/MainWindow.vala:170
-#, c-format
-msgid "%u min read"
-msgstr "%u min de lecture"
-
-#: src/MainWindow.vala:95
+#: src/Constants.vala.in:33
 msgid "Zoom out"
 msgstr ""
 
-#: src/MainWindow.vala:103
+#: src/Constants.vala.in:34
 msgid "Default zoom level"
 msgstr ""
 
-#: src/MainWindow.vala:115
+#: src/Constants.vala.in:35
 msgid "Zoom in"
 msgstr ""
 
-#: src/MainWindow.vala:142
+#: src/Constants.vala.in:37
 msgid "Menu"
 msgstr ""
+
+#: src/Constants.vala.in:39
+#, c-format
+msgid "%u characters"
+msgstr "%u caractères"
+
+#: src/Constants.vala.in:40
+#, c-format
+msgid "%u words"
+msgstr "%u mots"
+
+#: src/Constants.vala.in:41
+#, c-format
+msgid "%u min read"
+msgstr "%u min de lecture"
diff --git a/po/it.po b/po/it.po
index 43f0c05..9cad769 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-27 20:40+0200\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-04-26 16:45+0200\n"
 "Last-Translator: Mirko Brombin <send@mirko.pm>\n"
 "Language-Team: Italian\n"
@@ -18,33 +18,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: src/Views/TypewriterView.vala:63 src/MainWindow.vala:168
-#, c-format
-msgid "%u characters"
-msgstr "%u caratteri"
-
-#: src/Views/TypewriterView.vala:64 src/MainWindow.vala:169
-#, c-format
-msgid "%u words"
-msgstr "%u parole"
-
-#: src/Views/TypewriterView.vala:65 src/MainWindow.vala:170
-#, c-format
-msgid "%u min read"
-msgstr "%u minuti di lettura"
-
-#: src/MainWindow.vala:95
+#: src/Constants.vala.in:33
 msgid "Zoom out"
 msgstr ""
 
-#: src/MainWindow.vala:103
+#: src/Constants.vala.in:34
 msgid "Default zoom level"
 msgstr ""
 
-#: src/MainWindow.vala:115
+#: src/Constants.vala.in:35
 msgid "Zoom in"
 msgstr ""
 
-#: src/MainWindow.vala:142
+#: src/Constants.vala.in:37
 msgid "Menu"
 msgstr ""
+
+#: src/Constants.vala.in:39
+#, c-format
+msgid "%u characters"
+msgstr "%u caratteri"
+
+#: src/Constants.vala.in:40
+#, c-format
+msgid "%u words"
+msgstr "%u parole"
+
+#: src/Constants.vala.in:41
+#, c-format
+msgid "%u min read"
+msgstr "%u minuti di lettura"
diff --git a/po/nl.po b/po/nl.po
index 4946888..bdbb78a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,44 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-27 20:40+0200\n"
+"POT-Creation-Date: 2021-10-31 12:29+0000\n"
 "PO-Revision-Date: 2020-09-01 18:14+0200\n"
+"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Language-Team: \n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.4.1\n"
-"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: nl\n"
-
-#: src/Views/TypewriterView.vala:63 src/MainWindow.vala:168
-#, c-format
-msgid "%u characters"
-msgstr "%u tekens"
-
-#: src/Views/TypewriterView.vala:64 src/MainWindow.vala:169
-#, c-format
-msgid "%u words"
-msgstr "%u woorden"
-
-#: src/Views/TypewriterView.vala:65 src/MainWindow.vala:170
-#, c-format
-msgid "%u min read"
-msgstr "%u min leestijd"
 
-#: src/MainWindow.vala:95
+#: src/Constants.vala.in:33
 msgid "Zoom out"
 msgstr "Uitzoomen"
 
-#: src/MainWindow.vala:103
+#: src/Constants.vala.in:34
 msgid "Default zoom level"
 msgstr "Standaard zoomniveau"
 
-#: src/MainWindow.vala:115
+#: src/Constants.vala.in:35
 msgid "Zoom in"
 msgstr "Inzoomen"
 
-#: src/MainWindow.vala:142
+#: src/Constants.vala.in:37
 msgid "Menu"
 msgstr "Menu"
+
+#: src/Constants.vala.in:39
+#, c-format
+msgid "%u characters"
+msgstr "%u tekens"
+
+#: src/Constants.vala.in:40
+#, c-format
+msgid "%u words"
+msgstr "%u woorden"
+
+#: src/Constants.vala.in:41
+#, c-format
+msgid "%u min read"
+msgstr "%u min leestijd"
diff --git a/src/Application.vala b/src/Application.vala
index cf586e4..ced2a46 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -26,6 +26,13 @@ public class Application : Gtk.Application {
     private Models.Font _current_font;
     private Services.Settings settings;
 
+    construct {
+        Intl.setlocale (LocaleCategory.ALL, "");
+        Intl.bindtextdomain (Constants.GETTEXT_PACKAGE, Constants.LOCALEDIR);
+        Intl.bind_textdomain_codeset (Constants.GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (Constants.GETTEXT_PACKAGE);
+    }
+
     public static Application instance {
         get {
             if (_instance == null) {
@@ -38,7 +45,7 @@ public class Application : Gtk.Application {
 
     private Application () {
         Object (
-            application_id: Config.APP_ID,
+            application_id: Constants.APP_ID,
             flags: ApplicationFlags.FLAGS_NONE
         );
 
@@ -67,11 +74,6 @@ public class Application : Gtk.Application {
     }
 
     protected override void activate () {
-        Intl.setlocale (LocaleCategory.ALL, "");
-        GLib.Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-        GLib.Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        GLib.Intl.textdomain (GETTEXT_PACKAGE);
-
         var granite_settings = Granite.Settings.get_default ();
         var gtk_settings = Gtk.Settings.get_default ();
 
diff --git a/src/Config.vala.in b/src/Config.vala.in
deleted file mode 100644
index a3c7bd4..0000000
--- a/src/Config.vala.in
+++ /dev/null
@@ -1,2 +0,0 @@
-public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
-public const string LOCALEDIR = @LOCALEDIR@;
\ No newline at end of file
diff --git a/src/Config/Constants.vala b/src/Constants.vala.in
similarity index 51%
rename from src/Config/Constants.vala
rename to src/Constants.vala.in
index 472c03e..9258fd3 100644
--- a/src/Config/Constants.vala
+++ b/src/Constants.vala.in
@@ -19,11 +19,24 @@
 * Authored by: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
 */
 
-namespace Config {
-    public const string APP_ID = "com.github.manexim.typewriter";
-    public const string APP_AUTHOR = "Manexim";
-    public const string APP_NAME = "Typewriter";
-    public const string APP_VERSION = "0.5.0";
+namespace Constants {
+    private const string APP_ID = "@APP_ID@";
+    private const string APP_AUTHOR = "Manexim";
+    private const string APP_NAME = "Typewriter";
+    private const string APP_VERSION = "@APP_VERSION@";
 
-    public const uint WORDS_PER_MINUTE = 265;
+    private const uint WORDS_PER_MINUTE = 265;
+
+    private const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+    private const string LOCALEDIR = "@LOCALEDIR@";
+
+    private const string ZOOM_OUT = _("Zoom out");
+    private const string DEFAULT_ZOOM_LEVEL = _("Default zoom level");
+    private const string ZOOM_IN = _("Zoom in");
+
+    private const string MENU = _("Menu");
+
+    private const string NUMBER_CHARACTERS = _("%u characters");
+    private const string NUMBER_WORDS = _("%u words");
+    private const string NUMBER_MIN_READ = _("%u min read");
 }
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index be9c37a..7fa15b4 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -86,14 +86,14 @@ public class MainWindow : Hdy.Window {
         headerbar = new Hdy.HeaderBar () {
             decoration_layout = "close:",
             show_close_button = true,
-            title = Config.APP_NAME
+            title = Constants.APP_NAME
         };
 
         var zoom_out_button = new Gtk.Button.from_icon_name ("zoom-out-symbolic", Gtk.IconSize.MENU) {
             action_name = ACTION_PREFIX + ACTION_ZOOM_OUT_FONT,
             tooltip_markup = Granite.markup_accel_tooltip (
                 application.get_accels_for_action (ACTION_PREFIX + ACTION_ZOOM_OUT_FONT),
-                _("Zoom out")
+                Constants.ZOOM_OUT
             )
         };
 
@@ -101,7 +101,7 @@ public class MainWindow : Hdy.Window {
             action_name = ACTION_PREFIX + ACTION_ZOOM_DEFAULT_FONT,
             tooltip_markup = Granite.markup_accel_tooltip (
                 application.get_accels_for_action (ACTION_PREFIX + ACTION_ZOOM_DEFAULT_FONT),
-                _("Default zoom level")
+                Constants.DEFAULT_ZOOM_LEVEL
             )
         };
 
@@ -113,7 +113,7 @@ public class MainWindow : Hdy.Window {
             action_name = ACTION_PREFIX + ACTION_ZOOM_IN_FONT,
             tooltip_markup = Granite.markup_accel_tooltip (
                 application.get_accels_for_action (ACTION_PREFIX + ACTION_ZOOM_IN_FONT),
-                _("Zoom in")
+                Constants.ZOOM_IN
             )
         };
 
@@ -140,7 +140,7 @@ public class MainWindow : Hdy.Window {
 
         var app_menu = new Gtk.MenuButton () {
             image = new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR),
-            tooltip_text = _("Menu"),
+            tooltip_text = Constants.MENU,
             popover = menu
         };
 
@@ -171,9 +171,9 @@ public class MainWindow : Hdy.Window {
 
     private void update () {
         headerbar.subtitle = "%s • %s • %s".printf (
-            _("%u characters").printf (typewriter.model.characters),
-            _("%u words").printf (typewriter.model.words),
-            _("%u min read").printf (typewriter.model.read_time)
+            Constants.NUMBER_CHARACTERS.printf (typewriter.model.characters),
+            Constants.NUMBER_WORDS.printf (typewriter.model.words),
+            Constants.NUMBER_MIN_READ.printf (typewriter.model.read_time)
         );
     }
 
diff --git a/src/Models/Typewriter.vala b/src/Models/Typewriter.vala
index 527b98d..1e270f4 100644
--- a/src/Models/Typewriter.vala
+++ b/src/Models/Typewriter.vala
@@ -42,7 +42,7 @@ public class Models.Typewriter : Object {
 
                     characters = text_stripped.length;
                     words = text_stripped.split (" ").length;
-                    read_time = (uint) ((1.0 * words / Config.WORDS_PER_MINUTE) + 0.5);
+                    read_time = (uint) ((1.0 * words / Constants.WORDS_PER_MINUTE) + 0.5);
                 }
             } catch (RegexError e) {
                 stderr.printf (e.message);
@@ -54,7 +54,7 @@ public class Models.Typewriter : Object {
         owned get {
             return File.new_build_filename (
                 Environment.get_user_data_dir (),
-                Config.APP_ID
+                Constants.APP_ID
             );
         }
     }
@@ -63,7 +63,7 @@ public class Models.Typewriter : Object {
         owned get {
             return File.new_build_filename (
                 Environment.get_user_data_dir (),
-                Config.APP_ID,
+                Constants.APP_ID,
                 "autosave.md"
             );
         }
diff --git a/src/Services/Settings.vala b/src/Services/Settings.vala
index 3212593..05419bb 100644
--- a/src/Services/Settings.vala
+++ b/src/Services/Settings.vala
@@ -40,6 +40,6 @@ public class Services.Settings : Granite.Services.Settings {
     public int zoom { get; set; }
 
     private Settings () {
-        base (Config.APP_ID);
+        base (Constants.APP_ID);
     }
 }
diff --git a/src/Views/TypewriterView.vala b/src/Views/TypewriterView.vala
index a804a2f..1ee71af 100644
--- a/src/Views/TypewriterView.vala
+++ b/src/Views/TypewriterView.vala
@@ -64,9 +64,9 @@ public class Views.TypewriterView : Gtk.Grid {
 
     private void update () {
         label.label = "%s • %s • %s".printf (
-            _("%u characters").printf (model.characters),
-            _("%u words").printf (model.words),
-            _("%u min read").printf (model.read_time)
+            Constants.NUMBER_CHARACTERS.printf (model.characters),
+            Constants.NUMBER_WORDS.printf (model.words),
+            Constants.NUMBER_MIN_READ.printf (model.read_time)
         );
     }
 }
diff --git a/src/meson.build b/src/meson.build
index 515ba3e..1993ce4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,14 +1,16 @@
 config_data = configuration_data()
-config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
-config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+config_data.set('APP_ID', meson.project_name())
+config_data.set('APP_VERSION', meson.project_version())
+config_data.set('GETTEXT_PACKAGE', meson.project_name())
+config_data.set('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
+
 config_file = configure_file(
-    input: 'Config.vala.in',
+    input: 'Constants.vala.in',
     output: '@BASENAME@',
     configuration: config_data
 )
 
 sources = [
-    'Config/Constants.vala',
     'Controllers/TypewriterController.vala',
     'Models/Font.vala',
     'Models/Typewriter.vala',

From afbe47bd1ee2ad4f8c7119747f7600bbfd9fbedb Mon Sep 17 00:00:00 2001
From: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
Date: Tue, 2 Nov 2021 10:03:53 +0000
Subject: [PATCH 3/3] Update translations

---
 app                                  |  19 ++++
 po/POTFILES                          |   2 +-
 po/com.github.manexim.typewriter.pot |  16 +--
 po/de.po                             |  16 +--
 po/es.po                             |  16 +--
 po/extra/de.po                       |   6 +-
 po/extra/extra.pot                   |   6 +-
 po/extra/fr.po                       |   7 +-
 po/extra/hr.po                       | 154 +++++++++++++++++++++++++--
 po/extra/it.po                       |   7 +-
 po/extra/nl.po                       |   7 +-
 po/fr.po                             |  16 +--
 po/hr.po                             |  40 +++----
 po/it.po                             |  16 +--
 po/nl.po                             |  16 +--
 src/MainWindow.vala                  |  14 +--
 src/Strings.vala                     |  32 ++++++
 src/Views/TypewriterView.vala        |   6 +-
 src/meson.build                      |   3 +-
 19 files changed, 289 insertions(+), 110 deletions(-)
 create mode 100644 src/Strings.vala

diff --git a/app b/app
index 1bdb558..14e6e2e 100755
--- a/app
+++ b/app
@@ -4,6 +4,7 @@
 set -e
 
 APP=com.github.manexim.typewriter
+MODULE=typewriter
 
 case "$1" in
     build)
@@ -13,6 +14,24 @@ case "$1" in
     install)
         flatpak install --user -y ${APP}.flatpak
         ;;
+    pot)
+        TMPDIR=$(basename `mktemp -u`)
+        mkdir "$TMPDIR"
+        flatpak-builder build "$APP.yml" --force-clean --stop-at="$MODULE" --state-dir="$TMPDIR"
+        echo "ninja extra-pot; ninja $APP-pot" | flatpak-builder build "$APP.yml" --force-clean --build-shell="$MODULE" --state-dir="$TMPDIR"
+        cp "$TMPDIR/build/$MODULE/po/extra/extra.pot" po/extra/
+        cp "$TMPDIR/build/$MODULE/po/$APP.pot" po/
+        rm -rf "$TMPDIR"
+        ;;
+    po)
+        TMPDIR=$(basename `mktemp -u`)
+        mkdir "$TMPDIR"
+        flatpak-builder build "$APP.yml" --force-clean --stop-at="$MODULE" --state-dir="$TMPDIR"
+        echo "ninja extra-update-po; ninja $APP-update-po" | flatpak-builder build "$APP.yml" --force-clean --build-shell="$MODULE" --state-dir="$TMPDIR"
+        cp "$TMPDIR/build/$MODULE/po/extra/"*.po po/extra/
+        cp "$TMPDIR/build/$MODULE/po/"*.po po/
+        rm -rf "$TMPDIR"
+        ;;
     run)
         flatpak run ${APP}
         ;;
diff --git a/po/POTFILES b/po/POTFILES
index 8a5f5b8..bdaf538 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -3,5 +3,5 @@ src/Models/Typewriter.vala
 src/Services/Settings.vala
 src/Views/TypewriterView.vala
 src/Application.vala
-src/Constants.vala.in
 src/MainWindow.vala
+src/Strings.vala
diff --git a/po/com.github.manexim.typewriter.pot b/po/com.github.manexim.typewriter.pot
index dae7cf9..e644c1e 100644
--- a/po/com.github.manexim.typewriter.pot
+++ b/po/com.github.manexim.typewriter.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Constants.vala.in:33
+#: src/Strings.vala:23
 msgid "Zoom out"
 msgstr ""
 
-#: src/Constants.vala.in:34
+#: src/Strings.vala:24
 msgid "Default zoom level"
 msgstr ""
 
-#: src/Constants.vala.in:35
+#: src/Strings.vala:25
 msgid "Zoom in"
 msgstr ""
 
-#: src/Constants.vala.in:37
+#: src/Strings.vala:27
 msgid "Menu"
 msgstr ""
 
-#: src/Constants.vala.in:39
+#: src/Strings.vala:29
 #, c-format
 msgid "%u characters"
 msgstr ""
 
-#: src/Constants.vala.in:40
+#: src/Strings.vala:30
 #, c-format
 msgid "%u words"
 msgstr ""
 
-#: src/Constants.vala.in:41
+#: src/Strings.vala:31
 #, c-format
 msgid "%u min read"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 4729d5b..3db30cd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-02-08 13:43+0100\n"
 "Last-Translator: Marius Meisenzahl <mariusmeisenzahl@gmail.com>\n"
 "Language-Team: none\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/Constants.vala.in:33
+#: src/Strings.vala:23
 msgid "Zoom out"
 msgstr "Verkleinern"
 
-#: src/Constants.vala.in:34
+#: src/Strings.vala:24
 msgid "Default zoom level"
 msgstr "Standard Zoomfaktor"
 
-#: src/Constants.vala.in:35
+#: src/Strings.vala:25
 msgid "Zoom in"
 msgstr "Vergrößern"
 
-#: src/Constants.vala.in:37
+#: src/Strings.vala:27
 msgid "Menu"
 msgstr "Menü"
 
-#: src/Constants.vala.in:39
+#: src/Strings.vala:29
 #, c-format
 msgid "%u characters"
 msgstr "%u Zeichen"
 
-#: src/Constants.vala.in:40
+#: src/Strings.vala:30
 #, c-format
 msgid "%u words"
 msgstr "%u Wörter"
 
-#: src/Constants.vala.in:41
+#: src/Strings.vala:31
 #, c-format
 msgid "%u min read"
 msgstr "Lesezeit: %u Min."
diff --git a/po/es.po b/po/es.po
index f0a18d1..563cc7f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-05-16 08:50-0500\n"
 "Last-Translator: Alejandro Elí <@onerbs>\n"
 "Language-Team: none\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/Constants.vala.in:33
+#: src/Strings.vala:23
 msgid "Zoom out"
 msgstr ""
 
-#: src/Constants.vala.in:34
+#: src/Strings.vala:24
 msgid "Default zoom level"
 msgstr ""
 
-#: src/Constants.vala.in:35
+#: src/Strings.vala:25
 msgid "Zoom in"
 msgstr ""
 
-#: src/Constants.vala.in:37
+#: src/Strings.vala:27
 msgid "Menu"
 msgstr ""
 
-#: src/Constants.vala.in:39
+#: src/Strings.vala:29
 #, c-format
 msgid "%u characters"
 msgstr "%u carácteres"
 
-#: src/Constants.vala.in:40
+#: src/Strings.vala:30
 #, c-format
 msgid "%u words"
 msgstr "%u palabras"
 
-#: src/Constants.vala.in:41
+#: src/Strings.vala:31
 #, c-format
 msgid "%u min read"
 msgstr "Lectura de %u minutos"
diff --git a/po/extra/de.po b/po/extra/de.po
index 5a866ad..a833bdf 100644
--- a/po/extra/de.po
+++ b/po/extra/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-02-08 13:54+0100\n"
 "Last-Translator: Marius Meisenzahl <mariusmeisenzahl@gmail.com>\n"
 "Language-Team: none\n"
@@ -189,7 +189,3 @@ msgstr ""
 #: data/com.github.manexim.typewriter.appdata.xml.in:243
 msgid "Manexim"
 msgstr ""
-
-#: data/com.github.manexim.typewriter.desktop.in:8
-msgid "com.github.manexim.typewriter"
-msgstr ""
diff --git a/po/extra/extra.pot b/po/extra/extra.pot
index 00ea620..b98fd58 100644
--- a/po/extra/extra.pot
+++ b/po/extra/extra.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -189,7 +189,3 @@ msgstr ""
 #: data/com.github.manexim.typewriter.appdata.xml.in:243
 msgid "Manexim"
 msgstr ""
-
-#: data/com.github.manexim.typewriter.desktop.in:8
-msgid "com.github.manexim.typewriter"
-msgstr ""
diff --git a/po/extra/fr.po b/po/extra/fr.po
index 8ffd97f..fcec59d 100644
--- a/po/extra/fr.po
+++ b/po/extra/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-02-11 08:46+0100\n"
 "Last-Translator: Nathan Bonnemains (@NathanBnm)\n"
 "Language-Team: none\n"
@@ -193,6 +193,5 @@ msgstr "Version initiale"
 msgid "Manexim"
 msgstr "Manexim"
 
-#: data/com.github.manexim.typewriter.desktop.in:8
-msgid "com.github.manexim.typewriter"
-msgstr "com.github.manexim.typewriter"
+#~ msgid "com.github.manexim.typewriter"
+#~ msgstr "com.github.manexim.typewriter"
diff --git a/po/extra/hr.po b/po/extra/hr.po
index 6b4ed61..9e833e4 100644
--- a/po/extra/hr.po
+++ b/po/extra/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-08 13:58+0100\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2021-09-08 12:42+0100\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
 "Language-Team: none\n"
@@ -34,25 +34,163 @@ msgid "Get lost in typing and don't worry about losing your precious work."
 msgstr "Koncetriraj se samo na pisanje – sav tvoj rad sprema se automatski."
 
 #: data/com.github.manexim.typewriter.appdata.xml.in:21
+#: data/com.github.manexim.typewriter.appdata.xml.in:45
+#: data/com.github.manexim.typewriter.appdata.xml.in:68
+#: data/com.github.manexim.typewriter.appdata.xml.in:91
+#: data/com.github.manexim.typewriter.appdata.xml.in:113
+#: data/com.github.manexim.typewriter.appdata.xml.in:137
+#: data/com.github.manexim.typewriter.appdata.xml.in:158
+#: data/com.github.manexim.typewriter.appdata.xml.in:179
+msgid "New:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:23
+msgid "Using Hdy.Window for rounded corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:24
+msgid "Support dark style preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:48
+#: data/com.github.manexim.typewriter.appdata.xml.in:71
+#: data/com.github.manexim.typewriter.appdata.xml.in:94
+#: data/com.github.manexim.typewriter.appdata.xml.in:119
+#: data/com.github.manexim.typewriter.appdata.xml.in:141
+#: data/com.github.manexim.typewriter.appdata.xml.in:161
+#: data/com.github.manexim.typewriter.appdata.xml.in:183
+msgid "Improved:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:29
+#: data/com.github.manexim.typewriter.appdata.xml.in:51
+#: data/com.github.manexim.typewriter.appdata.xml.in:75
+#: data/com.github.manexim.typewriter.appdata.xml.in:98
+#: data/com.github.manexim.typewriter.appdata.xml.in:123
+#: data/com.github.manexim.typewriter.appdata.xml.in:144
+#: data/com.github.manexim.typewriter.appdata.xml.in:165
+#: data/com.github.manexim.typewriter.appdata.xml.in:186
+msgid "Fixed:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:32
+#: data/com.github.manexim.typewriter.appdata.xml.in:55
+#: data/com.github.manexim.typewriter.appdata.xml.in:78
+#: data/com.github.manexim.typewriter.appdata.xml.in:101
+#: data/com.github.manexim.typewriter.appdata.xml.in:126
+#: data/com.github.manexim.typewriter.appdata.xml.in:147
+#: data/com.github.manexim.typewriter.appdata.xml.in:168
+#: data/com.github.manexim.typewriter.appdata.xml.in:189
+msgid "Translations:"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:34
+#: data/com.github.manexim.typewriter.appdata.xml.in:57
+#: data/com.github.manexim.typewriter.appdata.xml.in:80
+#: data/com.github.manexim.typewriter.appdata.xml.in:103
+#: data/com.github.manexim.typewriter.appdata.xml.in:128
+#: data/com.github.manexim.typewriter.appdata.xml.in:149
+#: data/com.github.manexim.typewriter.appdata.xml.in:170
+#: data/com.github.manexim.typewriter.appdata.xml.in:191
+msgid "French (by NathanBnm)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:35
+#: data/com.github.manexim.typewriter.appdata.xml.in:58
+#: data/com.github.manexim.typewriter.appdata.xml.in:81
+#: data/com.github.manexim.typewriter.appdata.xml.in:104
+#: data/com.github.manexim.typewriter.appdata.xml.in:129
+#: data/com.github.manexim.typewriter.appdata.xml.in:150
+#: data/com.github.manexim.typewriter.appdata.xml.in:171
+#: data/com.github.manexim.typewriter.appdata.xml.in:192
+msgid "German (by meisenzahl)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:59
+#: data/com.github.manexim.typewriter.appdata.xml.in:82
+#: data/com.github.manexim.typewriter.appdata.xml.in:105
+#: data/com.github.manexim.typewriter.appdata.xml.in:130
+#: data/com.github.manexim.typewriter.appdata.xml.in:151
+#: data/com.github.manexim.typewriter.appdata.xml.in:172
+msgid "Italian (by mirkobrombin)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:37
+#: data/com.github.manexim.typewriter.appdata.xml.in:60
+#: data/com.github.manexim.typewriter.appdata.xml.in:83
+#: data/com.github.manexim.typewriter.appdata.xml.in:106
+#: data/com.github.manexim.typewriter.appdata.xml.in:131
+#: data/com.github.manexim.typewriter.appdata.xml.in:152
+#: data/com.github.manexim.typewriter.appdata.xml.in:173
+msgid "Spanish (by onerbs)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:38
+#: data/com.github.manexim.typewriter.appdata.xml.in:61
+#: data/com.github.manexim.typewriter.appdata.xml.in:84
+#: data/com.github.manexim.typewriter.appdata.xml.in:107
+msgid "Dutch (by Vistaus)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:39
+#: data/com.github.manexim.typewriter.appdata.xml.in:62
+#: data/com.github.manexim.typewriter.appdata.xml.in:85
+msgid "Russian (by logdimov)"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:53
+msgid "Fix typo in name of translator"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:73
+#: data/com.github.manexim.typewriter.appdata.xml.in:96
+#: data/com.github.manexim.typewriter.appdata.xml.in:121
+#: data/com.github.manexim.typewriter.appdata.xml.in:163
+#, fuzzy
+msgid "Update translations"
+msgstr "Aktualiziraj ikonu"
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:115
+msgid "Respect an OS-wide dark preference"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:116
+msgid "Add actions"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:117
+msgid "Add audio feedback if zoom is not possible"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:139
+msgid "Add rounded window corners"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:181
+msgid "Add menu to set zoom level"
+msgstr ""
+
+#: data/com.github.manexim.typewriter.appdata.xml.in:198
 msgid "Use bottom bar instead of overlay"
 msgstr "Koristi donju traku umjesto prozora"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:26
+#: data/com.github.manexim.typewriter.appdata.xml.in:203
 msgid "Update icon branding"
 msgstr "Aktualiziraj stil ikona"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:31
+#: data/com.github.manexim.typewriter.appdata.xml.in:208
 msgid "Update icon"
 msgstr "Aktualiziraj ikonu"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:36
+#: data/com.github.manexim.typewriter.appdata.xml.in:213
 msgid "Initial release"
 msgstr "Prvo izdanje"
 
-#: data/com.github.manexim.typewriter.appdata.xml.in:46
+#: data/com.github.manexim.typewriter.appdata.xml.in:243
 msgid "Manexim"
 msgstr "Manexim"
 
-#: data/com.github.manexim.typewriter.desktop.in:8
-msgid "com.github.manexim.typewriter"
-msgstr "com.github.manexim.typewriter"
+#~ msgid "com.github.manexim.typewriter"
+#~ msgstr "com.github.manexim.typewriter"
diff --git a/po/extra/it.po b/po/extra/it.po
index 3e21d15..0f1cfdc 100644
--- a/po/extra/it.po
+++ b/po/extra/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-04-26 16:47+0200\n"
 "Last-Translator: Mirko Brombin <send@mirko.pm>\n"
 "Language-Team: Italian\n"
@@ -194,6 +194,5 @@ msgstr "Versione iniziale"
 msgid "Manexim"
 msgstr "Manexim"
 
-#: data/com.github.manexim.typewriter.desktop.in:8
-msgid "com.github.manexim.typewriter"
-msgstr "com.github.manexim.typewriter"
+#~ msgid "com.github.manexim.typewriter"
+#~ msgstr "com.github.manexim.typewriter"
diff --git a/po/extra/nl.po b/po/extra/nl.po
index 037f7d9..781a97c 100644
--- a/po/extra/nl.po
+++ b/po/extra/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-09-01 18:16+0200\n"
 "Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Language-Team: \n"
@@ -193,6 +193,5 @@ msgstr "Initiële uitgave"
 msgid "Manexim"
 msgstr "Manexim"
 
-#: data/com.github.manexim.typewriter.desktop.in:8
-msgid "com.github.manexim.typewriter"
-msgstr "com.github.manexim.typewriter"
+#~ msgid "com.github.manexim.typewriter"
+#~ msgstr "com.github.manexim.typewriter"
diff --git a/po/fr.po b/po/fr.po
index 3b73f0e..8f054b2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-02-11 08:46+0100\n"
 "Last-Translator: Nathan Bonnemains (@NathanBnm)\n"
 "Language-Team: none\n"
@@ -17,33 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/Constants.vala.in:33
+#: src/Strings.vala:23
 msgid "Zoom out"
 msgstr ""
 
-#: src/Constants.vala.in:34
+#: src/Strings.vala:24
 msgid "Default zoom level"
 msgstr ""
 
-#: src/Constants.vala.in:35
+#: src/Strings.vala:25
 msgid "Zoom in"
 msgstr ""
 
-#: src/Constants.vala.in:37
+#: src/Strings.vala:27
 msgid "Menu"
 msgstr ""
 
-#: src/Constants.vala.in:39
+#: src/Strings.vala:29
 #, c-format
 msgid "%u characters"
 msgstr "%u caractères"
 
-#: src/Constants.vala.in:40
+#: src/Strings.vala:30
 #, c-format
 msgid "%u words"
 msgstr "%u mots"
 
-#: src/Constants.vala.in:41
+#: src/Strings.vala:31
 #, c-format
 msgid "%u min read"
 msgstr "%u min de lecture"
diff --git a/po/hr.po b/po/hr.po
index b8922aa..ec70bc7 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-27 20:40+0200\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2021-09-06 12:22+0100\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
 "Language-Team: none\n"
@@ -18,33 +18,33 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: src/Views/TypewriterView.vala:63 src/MainWindow.vala:168
-#, c-format
-msgid "%u characters"
-msgstr "Broj znakova: %u"
-
-#: src/Views/TypewriterView.vala:64 src/MainWindow.vala:169
-#, c-format
-msgid "%u words"
-msgstr "Broj riječi: %u"
-
-#: src/Views/TypewriterView.vala:65 src/MainWindow.vala:170
-#, c-format
-msgid "%u min read"
-msgstr "Vrijeme za čitanje: %u min"
-
-#: src/MainWindow.vala:95
+#: src/Strings.vala:23
 msgid "Zoom out"
 msgstr "Umanji"
 
-#: src/MainWindow.vala:103
+#: src/Strings.vala:24
 msgid "Default zoom level"
 msgstr "Standardno uvećanje"
 
-#: src/MainWindow.vala:115
+#: src/Strings.vala:25
 msgid "Zoom in"
 msgstr "Uvećaj"
 
-#: src/MainWindow.vala:142
+#: src/Strings.vala:27
 msgid "Menu"
 msgstr "Izbornik"
+
+#: src/Strings.vala:29
+#, c-format
+msgid "%u characters"
+msgstr "Broj znakova: %u"
+
+#: src/Strings.vala:30
+#, c-format
+msgid "%u words"
+msgstr "Broj riječi: %u"
+
+#: src/Strings.vala:31
+#, c-format
+msgid "%u min read"
+msgstr "Vrijeme za čitanje: %u min"
diff --git a/po/it.po b/po/it.po
index 9cad769..6d0368c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-04-26 16:45+0200\n"
 "Last-Translator: Mirko Brombin <send@mirko.pm>\n"
 "Language-Team: Italian\n"
@@ -18,33 +18,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: src/Constants.vala.in:33
+#: src/Strings.vala:23
 msgid "Zoom out"
 msgstr ""
 
-#: src/Constants.vala.in:34
+#: src/Strings.vala:24
 msgid "Default zoom level"
 msgstr ""
 
-#: src/Constants.vala.in:35
+#: src/Strings.vala:25
 msgid "Zoom in"
 msgstr ""
 
-#: src/Constants.vala.in:37
+#: src/Strings.vala:27
 msgid "Menu"
 msgstr ""
 
-#: src/Constants.vala.in:39
+#: src/Strings.vala:29
 #, c-format
 msgid "%u characters"
 msgstr "%u caratteri"
 
-#: src/Constants.vala.in:40
+#: src/Strings.vala:30
 #, c-format
 msgid "%u words"
 msgstr "%u parole"
 
-#: src/Constants.vala.in:41
+#: src/Strings.vala:31
 #, c-format
 msgid "%u min read"
 msgstr "%u minuti di lettura"
diff --git a/po/nl.po b/po/nl.po
index bdbb78a..703d757 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.manexim.typewriter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 12:29+0000\n"
+"POT-Creation-Date: 2021-11-02 10:03+0000\n"
 "PO-Revision-Date: 2020-09-01 18:14+0200\n"
 "Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Language-Team: \n"
@@ -18,33 +18,33 @@ msgstr ""
 "X-Generator: Poedit 2.4.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/Constants.vala.in:33
+#: src/Strings.vala:23
 msgid "Zoom out"
 msgstr "Uitzoomen"
 
-#: src/Constants.vala.in:34
+#: src/Strings.vala:24
 msgid "Default zoom level"
 msgstr "Standaard zoomniveau"
 
-#: src/Constants.vala.in:35
+#: src/Strings.vala:25
 msgid "Zoom in"
 msgstr "Inzoomen"
 
-#: src/Constants.vala.in:37
+#: src/Strings.vala:27
 msgid "Menu"
 msgstr "Menu"
 
-#: src/Constants.vala.in:39
+#: src/Strings.vala:29
 #, c-format
 msgid "%u characters"
 msgstr "%u tekens"
 
-#: src/Constants.vala.in:40
+#: src/Strings.vala:30
 #, c-format
 msgid "%u words"
 msgstr "%u woorden"
 
-#: src/Constants.vala.in:41
+#: src/Strings.vala:31
 #, c-format
 msgid "%u min read"
 msgstr "%u min leestijd"
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 7c2b752..1b32f78 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -93,7 +93,7 @@ public class MainWindow : Hdy.Window {
             action_name = ACTION_PREFIX + ACTION_ZOOM_OUT_FONT,
             tooltip_markup = Granite.markup_accel_tooltip (
                 application.get_accels_for_action (ACTION_PREFIX + ACTION_ZOOM_OUT_FONT),
-                Constants.ZOOM_OUT
+                Strings.ZOOM_OUT
             )
         };
 
@@ -101,7 +101,7 @@ public class MainWindow : Hdy.Window {
             action_name = ACTION_PREFIX + ACTION_ZOOM_DEFAULT_FONT,
             tooltip_markup = Granite.markup_accel_tooltip (
                 application.get_accels_for_action (ACTION_PREFIX + ACTION_ZOOM_DEFAULT_FONT),
-                Constants.DEFAULT_ZOOM_LEVEL
+                Strings.DEFAULT_ZOOM_LEVEL
             )
         };
 
@@ -113,7 +113,7 @@ public class MainWindow : Hdy.Window {
             action_name = ACTION_PREFIX + ACTION_ZOOM_IN_FONT,
             tooltip_markup = Granite.markup_accel_tooltip (
                 application.get_accels_for_action (ACTION_PREFIX + ACTION_ZOOM_IN_FONT),
-                Constants.ZOOM_IN
+                Strings.ZOOM_IN
             )
         };
 
@@ -140,7 +140,7 @@ public class MainWindow : Hdy.Window {
 
         var app_menu = new Gtk.MenuButton () {
             image = new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR),
-            tooltip_text = Constants.MENU,
+            tooltip_text = Strings.MENU,
             popover = menu
         };
 
@@ -168,9 +168,9 @@ public class MainWindow : Hdy.Window {
 
     private void update () {
         headerbar.subtitle = "%s • %s • %s".printf (
-            Constants.NUMBER_CHARACTERS.printf (typewriter.model.characters),
-            Constants.NUMBER_WORDS.printf (typewriter.model.words),
-            Constants.NUMBER_MIN_READ.printf (typewriter.model.read_time)
+            Strings.NUMBER_CHARACTERS.printf (typewriter.model.characters),
+            Strings.NUMBER_WORDS.printf (typewriter.model.words),
+            Strings.NUMBER_MIN_READ.printf (typewriter.model.read_time)
         );
     }
 
diff --git a/src/Strings.vala b/src/Strings.vala
new file mode 100644
index 0000000..416570c
--- /dev/null
+++ b/src/Strings.vala
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2021 Manexim (https://github.com/manexim)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
+ * Authored by: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
+ */
+
+namespace Strings {
+    private const string ZOOM_OUT = _("Zoom out");
+    private const string DEFAULT_ZOOM_LEVEL = _("Default zoom level");
+    private const string ZOOM_IN = _("Zoom in");
+
+    private const string MENU = _("Menu");
+
+    private const string NUMBER_CHARACTERS = _("%u characters");
+    private const string NUMBER_WORDS = _("%u words");
+    private const string NUMBER_MIN_READ = _("%u min read");
+}
diff --git a/src/Views/TypewriterView.vala b/src/Views/TypewriterView.vala
index 1ee71af..08ec647 100644
--- a/src/Views/TypewriterView.vala
+++ b/src/Views/TypewriterView.vala
@@ -64,9 +64,9 @@ public class Views.TypewriterView : Gtk.Grid {
 
     private void update () {
         label.label = "%s • %s • %s".printf (
-            Constants.NUMBER_CHARACTERS.printf (model.characters),
-            Constants.NUMBER_WORDS.printf (model.words),
-            Constants.NUMBER_MIN_READ.printf (model.read_time)
+            Strings.NUMBER_CHARACTERS.printf (model.characters),
+            Strings.NUMBER_WORDS.printf (model.words),
+            Strings.NUMBER_MIN_READ.printf (model.read_time)
         );
     }
 }
diff --git a/src/meson.build b/src/meson.build
index 1993ce4..c726600 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,7 +16,8 @@ sources = [
     'Models/Typewriter.vala',
     'Services/Settings.vala',
     'Views/TypewriterView.vala',
-    'MainWindow.vala'
+    'MainWindow.vala',
+    'Strings.vala'
 ]
 
 executable(