build: drop intltool requirement

data/cinnamon-wayland.desktop.in.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-_Name=Cinnamon (Wayland session)
-_Comment=Window management and application launching
+Name=Cinnamon (Wayland session)
+Comment=Window management and application launching
 Exec=cinnamon --replace
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=cinnamon

data/cinnamon.desktop.in.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-_Name=Cinnamon
-_Comment=Window management and application launching
+Name=Cinnamon
+Comment=Window management and application launching
 Exec=@bindir@/cinnamon-launcher
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=cinnamon

data/cinnamon2d.desktop.in.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-_Name=Cinnamon 2D
-_Comment=Window management and application launching
+Name=Cinnamon 2D
+Comment=Window management and application launching
 Exec=@bindir@/cinnamon2d
 Categories=GNOME;GTK;System;Core;
 OnlyShowIn=X-Cinnamon;

data/meson.build

@@ -28,17 +28,15 @@ if get_option('wayland')
 endif
 
 foreach desktop_file : desktop_files
-    desktop = configure_file(
-        input: desktop_file + '.in.in',
-        output: desktop_file + '.in',
-        configuration: desktop_conf,
-    )
-
-    custom_target(
-        desktop_file,
-        input: desktop,
+    i18n.merge_file(
+        type: 'desktop',
+        input: configure_file(
+            input: desktop_file + '.in.in',
+            output: desktop_file + '.in',
+            configuration: desktop_conf,
+        ),
         output: desktop_file,
-        command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+        po_dir: po_dir,
         install: true,
         install_dir: desktopdir,
     )

makepot

@@ -1,14 +1,8 @@
 #!/bin/bash
 
-find files/usr/share/cinnamon -name "*.ui" -exec intltool-extract --type=gettext/glade {} \;
+xgettext -cTranslators -cTRANSLATORS --keyword=_ --keyword=N_ --from-code=UTF-8 \
+	--files-from=po/POTFILES.in --output=cinnamon.pot
+xgettext -c --language=Python --keyword=_ --output=cinnamon.pot --join-existing files/usr/bin/*
 
-xgettext --language=C --keyword=_ --keyword=N_ --output=cinnamon.pot src/*.c src/*/*.c
-
-find files/usr/share/cinnamon -name "*.ui.h" -exec xgettext --language=C --keyword=_ --keyword=N_ --output=cinnamon.pot --join-existing {} \;
-
-xgettext -cTranslators --language=JavaScript --keyword=_ --keyword=N_ --output=cinnamon.pot --join-existing --from-code=UTF-8 js/*/*.js files/usr/share/cinnamon/*/*/*.js
-xgettext -c --language=Python --keyword=_ --output=cinnamon.pot --join-existing generate_additional_files.py files/usr/share/cinnamon/*/*.py files/usr/share/cinnamon/*/*/*.py files/usr/bin/*
 files/usr/bin/cinnamon-xlet-makepot -j -p -m -o cinnamon.pot files/usr/share/cinnamon/applets/
 files/usr/bin/cinnamon-xlet-makepot -j -p -m -o cinnamon.pot files/usr/share/cinnamon/desklets/
-
-find files/usr/share/cinnamon -name "*.ui.h" -exec rm -f {} \;

meson.build

@@ -79,7 +79,6 @@ message('Building recorder: @0@'.format(get_option('build_recorder')))
 cc = meson.get_compiler('c')
 math = cc.find_library('m', required: false)
 
-intltool_merge = find_program('intltool-merge')
 python = find_program('python3')
 
 # generate config.h