diff --git a/data/io.github.leolost2605.gradebook.desktop b/data/io.github.leolost2605.gradebook.desktop.in
similarity index 100%
rename from data/io.github.leolost2605.gradebook.desktop
rename to data/io.github.leolost2605.gradebook.desktop.in
diff --git a/data/io.github.leolost2605.gradebook.metainfo.xml b/data/io.github.leolost2605.gradebook.metainfo.xml.in
similarity index 84%
rename from data/io.github.leolost2605.gradebook.metainfo.xml
rename to data/io.github.leolost2605.gradebook.metainfo.xml.in
index 7cde2f9..fa877fe 100644
--- a/data/io.github.leolost2605.gradebook.metainfo.xml
+++ b/data/io.github.leolost2605.gradebook.metainfo.xml.in
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
   <id>io.github.leolost2605.gradebook</id>
-  
+
   <name>Gradebook</name>
   <summary>Keep track of your grades</summary>
-  
+
   <metadata_license>CC-BY-4.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
-  
+
   <description>
     <p>
       Gradebook is a simple tool that helps you keep track of your grades. This way you always know how you are doing in your courses.
@@ -20,10 +20,11 @@
         <li>Your average is calculated automatically taking the weighting of the different categories into account</li>
       </ul>
   </description>
-  
-  <developer_name>Leonhard Kargl</developer_name>
+
+  <developer_name translatable="no">Leonhard Kargl</developer_name>
 
   <launchable type="desktop-id">io.github.leolost2605.gradebook.desktop</launchable>
+  <translation type="gettext">io.github.leolost2605.gradebook</translation>
   <screenshots>
     <screenshot type="default">
       <caption>The start page of the app</caption>
@@ -45,7 +46,7 @@
 
   <releases>
     <release version="1.2" date="2023-12-24" urgency="medium">
-      <description>
+      <description translatable="no">
         <p>This release brings a completely refreshed UI, updating it to the latest GNOME 45 HIG. Huge thanks to skøldis (gradebook@turtle.garden) for making this possible! Since this is such a massive change be sure to report any issues you discover.</p>
         <p>More improvements:</p>
         <ul>
@@ -55,7 +56,7 @@
       </description>
     </release>
     <release version="1.1.1" date="2022-12-25" urgency="medium">
-      <description>
+      <description translatable="no">
         <p>Changes:</p>
         <ul>
           <li>Translations for additional languages were added</li>
@@ -66,6 +67,9 @@
   </releases>
 
   <url type="homepage">https://github.com/leolost2605/Gradebook</url>
+  <url type="bugtracker">https://github.com/leolost2605/Gradebook/issues</url>
+  <url type="vcs-browser">https://github.com/leolost2605/Gradebook</url>
+  <url type="translate">https://github.com/leolost2605/Gradebook/tree/main/po</url>
 
-  <content_rating type="oars-1.0" />
+  <content_rating type="oars-1.1" />
 </component>
diff --git a/io.github.leolost2605.gradebook.json b/io.github.leolost2605.gradebook.json
index dbe1a78..0b2761c 100644
--- a/io.github.leolost2605.gradebook.json
+++ b/io.github.leolost2605.gradebook.json
@@ -13,6 +13,7 @@
         {
             "name": "gradebook",
             "buildsystem": "meson",
+            "run-tests": true,
             "sources": [
                 {
                     "type": "dir",
diff --git a/meson.build b/meson.build
index d6e260f..66eec33 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,8 @@
 # project name and programming language
 project('io.github.leolost2605.gradebook', 'vala', 'c')
 
+i18n = import('i18n')
+
 subdir ('po')
 
 conf = configuration_data()
@@ -51,16 +53,42 @@ executable(
     install: true
 )
 
-install_data (
-'data' / 'io.github.leolost2605.gradebook.desktop',
-install_dir: get_option('datadir') / 'applications'
+# Create desktop file
+desktop_file = i18n.merge_file(
+  input: 'data/io.github.leolost2605.gradebook.desktop.in',
+  output: 'io.github.leolost2605.gradebook.desktop',
+  type: 'desktop',
+  po_dir: './po',
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'applications')
 )
 
-install_data (
-'data' / 'io.github.leolost2605.gradebook.metainfo.xml',
-install_dir: get_option('datadir') / 'metainfo'
+# Validate desktop file
+desktop_utils = find_program('desktop-file-validate', required: false)
+if desktop_utils.found()
+  test('Validate desktop file', desktop_utils,
+    args: [desktop_file]
+  )
+endif
+
+# Create appdata file
+appdata_file = i18n.merge_file(
+  input: 'data/io.github.leolost2605.gradebook.metainfo.xml.in',
+  output: 'io.github.leolost2605.gradebook.metainfo.xml',
+  po_dir: './po',
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
+# Validate appdata file
+appstreamcli = find_program('appstreamcli', required: false)
+if appstreamcli.found()
+  test('Validate appdata file', appstreamcli,
+    args: ['validate', '--no-net', '--explain', appdata_file.full_path()],
+    workdir: meson.current_build_dir()
+  )
+endif
+
 # Install our icons in all the required sizes
 icon_sizes = ['16', '24', '32', '48', '64', '128']
 
diff --git a/po/LINGUAS b/po/LINGUAS
index f1df5c7..a6b619d 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1,6 @@
-es it nl ru
+de
+es
+it
+nl
+ru
+tr
diff --git a/po/POTFILES b/po/POTFILES
index 21757ce..a317f4e 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,3 +1,5 @@
+data/io.github.leolost2605.gradebook.desktop.in
+data/io.github.leolost2605.gradebook.metainfo.xml.in
 src/add-category-dialog.vala
 src/application.vala
 src/category.vala
diff --git a/po/io.github.leolost2605.gradebook.pot b/po/io.github.leolost2605.gradebook.pot
index 28662c1..01807a5 100644
--- a/po/io.github.leolost2605.gradebook.pot
+++ b/po/io.github.leolost2605.gradebook.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: io.github.leolost2605.gradebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-24 12:50+0100\n"
+"POT-Creation-Date: 2024-01-10 19:37+0300\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,6 +17,64 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: data/io.github.leolost2605.gradebook.desktop.in:6
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:5
+#: src/application.vala:35 src/window.vala:12
+msgid "Gradebook"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.desktop.in:7
+msgid "A simple tool to keep track of your grades"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:6
+msgid "Keep track of your grades"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:12
+msgid ""
+"Gradebook is a simple tool that helps you keep track of your grades. This "
+"way you always know how you are doing in your courses."
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:15
+msgid "Features:"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:17
+msgid "Support for numerical and percentage systems"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:18
+msgid "Assign your grades to categories with different weighting"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:19
+msgid "Add notes to your grades so that you later know how you could improve"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:20
+msgid ""
+"Your average is calculated automatically taking the weighting of the "
+"different categories into account"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:30
+msgid "The start page of the app"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:34
+msgid "Example for a subject"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:38
+msgid "Menu for the addition of a subject"
+msgstr ""
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:42
+msgid "Gradebook showing its adaptive mode"
+msgstr ""
+
 #: src/add-category-dialog.vala:7 src/edit-subject-dialog.vala:72
 msgid "Add New Category"
 msgstr ""
@@ -24,7 +82,7 @@ msgstr ""
 #. BUTTONS
 #: src/add-category-dialog.vala:12 src/edit-subject-dialog.vala:26
 #: src/edit-subject-dialog.vala:141 src/new-grade-dialog.vala:14
-#: src/subject-page.vala:240
+#: src/subject-page.vala:245
 msgid "Cancel"
 msgstr ""
 
@@ -44,10 +102,6 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 
-#: src/application.vala:35 src/window.vala:12
-msgid "Gradebook"
-msgstr ""
-
 #: src/edit-subject-dialog.vala:12
 msgid "New Subject"
 msgstr ""
@@ -83,7 +137,7 @@ msgstr ""
 msgid "If you delete %s, its information will be deleted permanently."
 msgstr ""
 
-#: src/edit-subject-dialog.vala:142 src/subject-page.vala:241
+#: src/edit-subject-dialog.vala:142 src/subject-page.vala:246
 msgid "Delete"
 msgstr ""
 
@@ -115,49 +169,49 @@ msgstr ""
 msgid "Toggle Sidebar"
 msgstr ""
 
-#: src/subject-page.vala:76
+#: src/subject-page.vala:79
 msgid "Average:"
 msgstr ""
 
-#: src/subject-page.vala:87
+#: src/subject-page.vala:90
 msgid "New Grade…"
 msgstr ""
 
-#: src/subject-page.vala:94
+#: src/subject-page.vala:97
 msgid "No Grades"
 msgstr ""
 
-#: src/subject-page.vala:95
+#: src/subject-page.vala:98
 msgid "Add new grades by clicking the “New Grade…” button."
 msgstr ""
 
-#: src/subject-page.vala:127
+#: src/subject-page.vala:130
 msgid "No Subjects"
 msgstr ""
 
-#: src/subject-page.vala:128
+#: src/subject-page.vala:131
 msgid "Add new subjects using the “+” button in the top left corner."
 msgstr ""
 
-#: src/subject-page.vala:204
+#: src/subject-page.vala:209
 msgid "Error"
 msgstr ""
 
-#: src/subject-page.vala:204
+#: src/subject-page.vala:209
 msgid ""
 "This subject has no categories. Add at least one category in order to add a "
 "grade."
 msgstr ""
 
-#: src/subject-page.vala:206
+#: src/subject-page.vala:211
 msgid "OK"
 msgstr ""
 
-#: src/subject-page.vala:237
+#: src/subject-page.vala:242
 msgid "Delete Grade?"
 msgstr ""
 
-#: src/subject-page.vala:238
+#: src/subject-page.vala:243
 msgid "If you delete this grade, its information will be deleted permanently."
 msgstr ""
 
diff --git a/po/meson.build b/po/meson.build
index 994a28e..be1aff6 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,10 +1 @@
-# Include the translations module
-i18n = import('i18n')
-
-# Set our translation domain
-add_project_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language:'c')
-
-i18n.gettext(meson.project_name(),
-    args: '--directory=' + meson.source_root(),
-    preset: 'glib'
-)
\ No newline at end of file
+i18n.gettext('io.github.leolost2605.gradebook', preset: 'glib')
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 0000000..cd6f8bb
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,229 @@
+# Turkish translation for Gradebook.
+# Copyright (C) 2024 Gradebook's COPYRIGHT HOLDER
+# This file is distributed under the same license as the Gradebook package.
+#
+# Sabri Ünal <libreajans@gmail.com>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Gradebook\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-01-10 19:23+0300\n"
+"PO-Revision-Date: 2024-01-10 19:40+0300\n"
+"Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
+"Language-Team: Türkçe <takim@gnome.org.tr>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.4.2\n"
+
+#: data/io.github.leolost2605.gradebook.desktop.in:6
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:5
+#: src/application.vala:35 src/window.vala:12
+msgid "Gradebook"
+msgstr "Not Defteri"
+
+#: data/io.github.leolost2605.gradebook.desktop.in:7
+msgid "A simple tool to keep track of your grades"
+msgstr "Notlarınızı takip etmek için basit bir araç"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:6
+msgid "Keep track of your grades"
+msgstr "Notlarınızı takip edin"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:12
+msgid ""
+"Gradebook is a simple tool that helps you keep track of your grades. This "
+"way you always know how you are doing in your courses."
+msgstr ""
+"Not Defteri, notlarınızı takip etmenize yardımcı olan basit bir araçtır. Bu "
+"şekilde derslerinizde nasıl olduğunuzu her zaman bilirsiniz."
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:15
+msgid "Features:"
+msgstr "Özellikler:"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:17
+msgid "Support for numerical and percentage systems"
+msgstr "Sayısal ve yüzde sistemlerini destekler"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:18
+msgid "Assign your grades to categories with different weighting"
+msgstr "Notlarınızı farklı ağırlıklara sahip kategorilere atayın"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:19
+msgid "Add notes to your grades so that you later know how you could improve"
+msgstr ""
+"Notlarınıza notlar ekleyin, böylece daha sonra nasıl geliştirebileceğinizi "
+"bilebilirsiniz"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:20
+msgid ""
+"Your average is calculated automatically taking the weighting of the "
+"different categories into account"
+msgstr ""
+"Ortalamanız, farklı kategorilerin ağırlıklandırılması dikkate alınarak "
+"kendiliğinden hesaplanır"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:30
+msgid "The start page of the app"
+msgstr "Uygulamanın başlangıç sayfası"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:34
+msgid "Example for a subject"
+msgstr "Konu örneği"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:38
+msgid "Menu for the addition of a subject"
+msgstr "Konu ekleme menüsü"
+
+#: data/io.github.leolost2605.gradebook.metainfo.xml.in:42
+msgid "Gradebook showing its adaptive mode"
+msgstr "Uyarlanabilir kipiyle not defteri görünümü"
+
+#: src/add-category-dialog.vala:7 src/edit-subject-dialog.vala:72
+msgid "Add New Category"
+msgstr "Yeni Kategori Ekle"
+
+#. BUTTONS
+#: src/add-category-dialog.vala:12 src/edit-subject-dialog.vala:26
+#: src/edit-subject-dialog.vala:141 src/new-grade-dialog.vala:14
+#: src/subject-page.vala:245
+msgid "Cancel"
+msgstr "İptal"
+
+#: src/add-category-dialog.vala:13 src/new-grade-dialog.vala:15
+msgid "Add"
+msgstr "Ekle"
+
+#: src/add-category-dialog.vala:22
+msgid "Category Name"
+msgstr "Kategori Adı"
+
+#: src/add-category-dialog.vala:28
+msgid "Category Percent"
+msgstr "Kategori Yüzdesi"
+
+#: src/application.vala:34
+msgid "translator-credits"
+msgstr "Sabri Ünal <libreajans@gmail.com>"
+
+#: src/edit-subject-dialog.vala:12
+msgid "New Subject"
+msgstr "Yeni Konu"
+
+#: src/edit-subject-dialog.vala:12
+msgid "Edit Subject"
+msgstr "Konuyu Düzenle"
+
+#: src/edit-subject-dialog.vala:31
+msgid "Save"
+msgstr "Kaydet"
+
+#: src/edit-subject-dialog.vala:60
+msgid "Subject Title"
+msgstr "Konu Başlığı"
+
+#: src/edit-subject-dialog.vala:82
+msgid "Subject Categories"
+msgstr "Konu Kategorileri"
+
+#: src/edit-subject-dialog.vala:86
+msgid "Delete Subject…"
+msgstr "Konuyu Sil…"
+
+#. /TRANSLATORS: %s is the name of a school subject
+#: src/edit-subject-dialog.vala:139
+#, c-format
+msgid "Delete %s?"
+msgstr "%s silinsin mi?"
+
+#: src/edit-subject-dialog.vala:140
+#, c-format
+msgid "If you delete %s, its information will be deleted permanently."
+msgstr "Eğer %s silerseniz, bilgileri kalıcı olarak silinir."
+
+#: src/edit-subject-dialog.vala:142 src/subject-page.vala:246
+msgid "Delete"
+msgstr "Sil"
+
+#: src/new-grade-dialog.vala:8
+msgid "Add New Grade"
+msgstr "Yeni Not Ekle"
+
+#: src/new-grade-dialog.vala:29
+msgid "Grade"
+msgstr "Not"
+
+#: src/new-grade-dialog.vala:32
+msgid "Category"
+msgstr "Kategori"
+
+#: src/new-grade-dialog.vala:37
+msgid "Note"
+msgstr "Not"
+
+#: src/subject-page.vala:36
+msgid "_Help"
+msgstr "_Yardım"
+
+#: src/subject-page.vala:39
+msgid "_About Gradebook"
+msgstr "Not Defteri _Hakkında"
+
+#: src/subject-page.vala:49
+msgid "Toggle Sidebar"
+msgstr "Kenar Çubuğunu Aç/Kapat"
+
+#: src/subject-page.vala:79
+msgid "Average:"
+msgstr "Ortalama:"
+
+#: src/subject-page.vala:90
+msgid "New Grade…"
+msgstr "Yeni Not…"
+
+#: src/subject-page.vala:97
+msgid "No Grades"
+msgstr "Not Yok"
+
+#: src/subject-page.vala:98
+msgid "Add new grades by clicking the “New Grade…” button."
+msgstr "“Yeni Not…” düğmesine tıklayarak yeni notlar ekleyin."
+
+#: src/subject-page.vala:130
+msgid "No Subjects"
+msgstr "Konu Yok"
+
+#: src/subject-page.vala:131
+msgid "Add new subjects using the “+” button in the top left corner."
+msgstr "Sol üst köşedeki “+” düğmesini kullanarak yeni konular ekleyin."
+
+#: src/subject-page.vala:209
+msgid "Error"
+msgstr "Hata"
+
+#: src/subject-page.vala:209
+msgid ""
+"This subject has no categories. Add at least one category in order to add a "
+"grade."
+msgstr ""
+"Bu konunun kategorisi yok. Not eklemek için en az bir kategori ekleyin."
+
+#: src/subject-page.vala:211
+msgid "OK"
+msgstr "Tamam"
+
+#: src/subject-page.vala:242
+msgid "Delete Grade?"
+msgstr "Not Silinsin Mi?"
+
+#: src/subject-page.vala:243
+msgid "If you delete this grade, its information will be deleted permanently."
+msgstr "Bu notu silerseniz, bilgileri kalıcı olarak silinir."
+
+#: src/window.vala:23
+msgid "Add a New Subject"
+msgstr "Yeni Konu Ekle"