meson: Stop using intltool

modern gettext is sufficient

https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration

Closes: https://gitlab.gnome.org/GNOME/totem/issues/218

51 files changed, 118 insertions, 114 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e4e3a3c6..d853be105 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ build-fedora:
   image: fedora:latest
   stage: test
   before_script:
-    - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc intltool itstool libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson nautilus-devel pygobject3-devel pylint python3-devel totem-pl-parser-devel vala flatpak-builder
+    - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc itstool libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson nautilus-devel pygobject3-devel pylint python3-devel totem-pl-parser-devel vala flatpak-builder
   script:
     - meson _build -Denable-vala=no
     - ninja -C _build test
diff --git a/meson.build b/meson.build
index 5647376fa..d46de94c0 100644
--- a/meson.build
+++ b/meson.build
@@ -270,11 +270,6 @@ pkg = import('pkgconfig')
 
 po_dir = join_paths(meson.source_root(), 'po')
 
-intltool_merge = find_program('intltool-merge')
-intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
-intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
-intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
-
 top_inc = include_directories('.')
 
 subdir('po')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 689df1f60..3dcaaea37 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,28 +1,27 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
 data/appdata/org.gnome.Totem.appdata.xml.in
-[type: gettext/glade]data/controls.ui
+data/controls.ui
 data/org.gnome.Totem.desktop.in.in
-[type: gettext/gsettings]data/org.gnome.totem.gschema.xml.in
-[type: gettext/glade]data/playlist.ui
-[type: gettext/glade]data/preferences.ui
-[type: gettext/glade]data/properties.ui
-[type: gettext/glade]data/shortcuts.ui
-[type: gettext/glade]data/totem.ui
-[type: gettext/glade]data/uri.ui
+data/org.gnome.totem.gschema.xml.in
+data/playlist.ui
+data/preferences.ui
+data/properties.ui
+data/shortcuts.ui
+data/totem.ui
+data/uri.ui
 src/backend/bacon-time-label.c
 src/backend/bacon-video-widget.c
 src/backend/bacon-video-widget-gst-missing-plugins.c
 src/gst/totem-time-helpers.c
 src/properties/bacon-video-widget-properties.c
-[type: gettext/glade]src/grilo.ui
+src/grilo.ui
 src/totem.c
 src/totem-gallery-thumbnailer.c
 src/totem-grilo.c
 src/totem-interface.c
 src/totem-main-toolbar.c
-[type: gettext/glade]src/totemmaintoolbar.ui
+src/totemmaintoolbar.ui
 src/totem-menu.c
 src/totem-object.c
 src/totem-open-location.c
@@ -31,54 +30,54 @@ src/totem-playlist.c
 src/totem-preferences.c
 src/totem-properties-main.c
 src/totem-properties-view.c
-[type: gettext/glade]src/totemselectiontoolbar.ui
+src/totemselectiontoolbar.ui
 src/totem-subtitle-encoding.c
 src/totem-time-label.c
 src/totem-uri.c
 src/totem-video-thumbnailer.c
-[type: gettext/ini]src/plugins/apple-trailers/apple-trailers.plugin.in
-[type: gettext/ini]src/plugins/autoload-subtitles/autoload-subtitles.plugin.in
-[type: gettext/ini]src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in
+src/plugins/apple-trailers/apple-trailers.plugin.in
+src/plugins/autoload-subtitles/autoload-subtitles.plugin.in
+src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in
 src/plugins/brasero-disc-recorder/totem-disc-recorder.c
-[type: gettext/ini]src/plugins/dbusservice/dbusservice.plugin.in
+src/plugins/dbusservice/dbusservice.plugin.in
 src/plugins/dbusservice/dbusservice.py
-[type: gettext/ini]src/plugins/gromit/gromit.plugin.in
+src/plugins/gromit/gromit.plugin.in
 src/plugins/gromit/totem-gromit.c
 src/plugins/im-status/totem-im-status.c
-[type: gettext/ini]src/plugins/im-status/totem-im-status.plugin.in
-[type: gettext/ini]src/plugins/lirc/lirc.plugin.in
+src/plugins/im-status/totem-im-status.plugin.in
+src/plugins/lirc/lirc.plugin.in
 src/plugins/lirc/totem-lirc.c
-[type: gettext/ini]src/plugins/media-player-keys/media-player-keys.plugin.in
-[type: gettext/ini]src/plugins/ontop/ontop.plugin.in
-[type: gettext/ini]src/plugins/opensubtitles/opensubtitles.plugin.in
+src/plugins/media-player-keys/media-player-keys.plugin.in
+src/plugins/ontop/ontop.plugin.in
+src/plugins/opensubtitles/opensubtitles.plugin.in
 src/plugins/opensubtitles/opensubtitles.py
-[type: gettext/glade]src/plugins/opensubtitles/opensubtitles.ui
-[type: gettext/gsettings]src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in
-[type: gettext/ini]src/plugins/properties/movie-properties.plugin.in
+src/plugins/opensubtitles/opensubtitles.ui
+src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in
+src/plugins/properties/movie-properties.plugin.in
 src/plugins/properties/totem-movie-properties.c
-[type: gettext/gsettings]src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in
-[type: gettext/ini]src/plugins/pythonconsole/pythonconsole.plugin.in
+src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in
+src/plugins/pythonconsole/pythonconsole.plugin.in
 src/plugins/pythonconsole/pythonconsole.py
-[type: gettext/ini]src/plugins/recent/recent.plugin.in
-[type: gettext/ini]src/plugins/rotation/rotation.plugin.in
+src/plugins/recent/recent.plugin.in
+src/plugins/rotation/rotation.plugin.in
 src/plugins/rotation/totem-rotation-plugin.vala
-[type: gettext/ini]src/plugins/save-file/save-file.plugin.in
+src/plugins/save-file/save-file.plugin.in
 src/plugins/save-file/totem-save-file.c
-[type: gettext/ini]src/plugins/screensaver/screensaver.plugin.in
+src/plugins/screensaver/screensaver.plugin.in
 src/plugins/screensaver/totem-screensaver.c
-[type: gettext/glade]src/plugins/screenshot/gallery.ui
+src/plugins/screenshot/gallery.ui
 src/plugins/screenshot/screenshot-filename-builder.c
-[type: gettext/ini]src/plugins/screenshot/screenshot.plugin.in
+src/plugins/screenshot/screenshot.plugin.in
 src/plugins/screenshot/totem-gallery.c
 src/plugins/screenshot/totem-gallery-progress.c
 src/plugins/screenshot/totem-screenshot-plugin.c
-[type: gettext/ini]src/plugins/skipto/skipto.plugin.in
-[type: gettext/glade]src/plugins/skipto/skipto.ui
+src/plugins/skipto/skipto.plugin.in
+src/plugins/skipto/skipto.ui
 src/plugins/skipto/totem-skipto.c
 src/plugins/skipto/totem-skipto-plugin.c
 src/plugins/skipto/totem-time-entry.c
 src/plugins/totem-plugins-engine.c
 src/plugins/variable-rate/totem-variable-rate-plugin.c
-[type: gettext/ini]src/plugins/variable-rate/variable-rate.plugin.in
-[type: gettext/ini]src/plugins/vimeo/vimeo.plugin.in
-[type: gettext/ini]src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in
+src/plugins/variable-rate/variable-rate.plugin.in
+src/plugins/vimeo/vimeo.plugin.in
+src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in
diff --git a/po/meson.build b/po/meson.build
index e9b77d79b..602787ea8 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1 @@
-i18n.gettext(meson.project_name(), preset: 'glib')
+i18n.gettext(meson.project_name(), preset: 'glib', args: [ '--keyword=Description' ])
diff --git a/src/plugins/apple-trailers/apple-trailers.plugin.in b/src/plugins/apple-trailers/apple-trailers.plugin.in
index 6f1dd3242..475d9c549 100644
--- a/src/plugins/apple-trailers/apple-trailers.plugin.in
+++ b/src/plugins/apple-trailers/apple-trailers.plugin.in
@@ -2,8 +2,8 @@
 Module=apple-trailers
 IAge=1
 Builtin=true
-_Name=Apple Trailers
-_Description=Sets the user agent for the Apple Trailers site
+Name=Apple Trailers
+Description=Sets the user agent for the Apple Trailers site
 Authors=Bastien Nocera
 Copyright=Copyright © 2012 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/apple-trailers/meson.build b/src/plugins/apple-trailers/meson.build
index 1ee6c716c..ce0b842ad 100644
--- a/src/plugins/apple-trailers/meson.build
+++ b/src/plugins/apple-trailers/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/autoload-subtitles/autoload-subtitles.plugin.in b/src/plugins/autoload-subtitles/autoload-subtitles.plugin.in
index b3f40b825..8e6a5c71f 100644
--- a/src/plugins/autoload-subtitles/autoload-subtitles.plugin.in
+++ b/src/plugins/autoload-subtitles/autoload-subtitles.plugin.in
@@ -2,8 +2,8 @@
 Module=autoload-subtitles
 IAge=1
 Builtin=true
-_Name=Autoload Subtitles
-_Description=Autoloads text subtitles
+Name=Autoload Subtitles
+Description=Autoloads text subtitles
 Authors=Bastien Nocera
 Copyright=Copyright © 2012 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/autoload-subtitles/meson.build b/src/plugins/autoload-subtitles/meson.build
index 8d64dc2c6..eab390d39 100644
--- a/src/plugins/autoload-subtitles/meson.build
+++ b/src/plugins/autoload-subtitles/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in b/src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in
index c6bfab03b..fb1b542ed 100644
--- a/src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in
+++ b/src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in
@@ -2,8 +2,8 @@
 Module=brasero-disc-recorder
 IAge=1
 Builtin=false
-_Name=Video Disc Recorder
-_Description=Records (S)VCDs or video DVDs
+Name=Video Disc Recorder
+Description=Records (S)VCDs or video DVDs
 Authors=Philippe Rouquier
 Copyright=Copyright © 2008 Philippe Rouquier
 Website=http://www.gnome.org/projects/brasero/
diff --git a/src/plugins/brasero-disc-recorder/meson.build b/src/plugins/brasero-disc-recorder/meson.build
index d328345e5..f4c2fbbb7 100644
--- a/src/plugins/brasero-disc-recorder/meson.build
+++ b/src/plugins/brasero-disc-recorder/meson.build
@@ -21,7 +21,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/dbusservice/dbusservice.plugin.in b/src/plugins/dbusservice/dbusservice.plugin.in
index b1eee28a7..ad30504c2 100644
--- a/src/plugins/dbusservice/dbusservice.plugin.in
+++ b/src/plugins/dbusservice/dbusservice.plugin.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=dbusservice
 IAge=1
-_Name=MPRIS D-Bus Interface
-_Description=Send notifications of currently-playing videos and allow remote control using MPRIS.
+Name=MPRIS D-Bus Interface
+Description=Send notifications of currently-playing videos and allow remote control using MPRIS.
 Authors=Lucky <lucky1.data@gmail.com>, Philip Withnall <philip@tecnocode.co.uk>
 Copyright=Copyright © 2009 Lucky, Philip Withnall
 Website=https://wiki.gnome.org/Apps/Videos
diff --git a/src/plugins/dbusservice/meson.build b/src/plugins/dbusservice/meson.build
index ce0d6cbbe..e9eba399f 100644
--- a/src/plugins/dbusservice/meson.build
+++ b/src/plugins/dbusservice/meson.build
@@ -13,7 +13,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/gromit/gromit.plugin.in b/src/plugins/gromit/gromit.plugin.in
index 644123cb3..6c564de3d 100644
--- a/src/plugins/gromit/gromit.plugin.in
+++ b/src/plugins/gromit/gromit.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=gromit
 IAge=1
-_Name=Gromit Annotations
-_Description=Presentation helper to make annotations on screen
+Name=Gromit Annotations
+Description=Presentation helper to make annotations on screen
 Authors=Bastien Nocera, Jan Arne Petersen
 Copyright=Copyright © 2007 Bastien Nocera, Jan Arne Petersen
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/gromit/meson.build b/src/plugins/gromit/meson.build
index 64057e8eb..a8deebbbe 100644
--- a/src/plugins/gromit/meson.build
+++ b/src/plugins/gromit/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/im-status/meson.build b/src/plugins/im-status/meson.build
index d691d4bca..ca70415aa 100644
--- a/src/plugins/im-status/meson.build
+++ b/src/plugins/im-status/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/im-status/totem-im-status.plugin.in b/src/plugins/im-status/totem-im-status.plugin.in
index fa6f7f5b8..bd496e20e 100644
--- a/src/plugins/im-status/totem-im-status.plugin.in
+++ b/src/plugins/im-status/totem-im-status.plugin.in
@@ -2,8 +2,8 @@
 Module=totem-im-status
 IAge=1
 Builtin=false
-_Name=Instant Messenger Status
-_Description=Set your Instant Messenger status to away when a movie is playing
+Name=Instant Messenger Status
+Description=Set your Instant Messenger status to away when a movie is playing
 Authors=Bastien Nocera, Philip Withnall
 Copyright=Copyright © 2007, 2011 Bastien Nocera, Philip Withnall
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/lirc/lirc.plugin.in b/src/plugins/lirc/lirc.plugin.in
index ab1cf33f9..705c748ff 100644
--- a/src/plugins/lirc/lirc.plugin.in
+++ b/src/plugins/lirc/lirc.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=lirc
 IAge=1
-_Name=Infrared Remote Control
-_Description=Support infrared remote control
+Name=Infrared Remote Control
+Description=Support infrared remote control
 Authors=Jan Arne Petersen
 Copyright=Copyright © 2007 Jan Arne Petersen
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/lirc/meson.build b/src/plugins/lirc/meson.build
index 0be0eeb7a..f14b07e10 100644
--- a/src/plugins/lirc/meson.build
+++ b/src/plugins/lirc/meson.build
@@ -20,7 +20,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/media-player-keys/media-player-keys.plugin.in b/src/plugins/media-player-keys/media-player-keys.plugin.in
index b5635d307..987307bce 100644
--- a/src/plugins/media-player-keys/media-player-keys.plugin.in
+++ b/src/plugins/media-player-keys/media-player-keys.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=media_player_keys
 IAge=1
-_Name=Media Player Keys
-_Description=Support additional media player keys
+Name=Media Player Keys
+Description=Support additional media player keys
 Builtin=true
 Authors=Jan Arne Petersen
 Copyright=Copyright © 2007 Jan Arne Petersen
diff --git a/src/plugins/media-player-keys/meson.build b/src/plugins/media-player-keys/meson.build
index 660b413cf..7550831d4 100644
--- a/src/plugins/media-player-keys/meson.build
+++ b/src/plugins/media-player-keys/meson.build
@@ -20,7 +20,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index 66ebaff32..31536e699 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -149,6 +149,16 @@ endif
 
 pylint_flags = ['-d', 'C0111', '-d', 'W0511', '-d', 'F0401', '-d', 'C0326' ]
 
+msgfmt_plugin_cmd = [
+  find_program('msgfmt'),
+  '--desktop',
+  '--keyword=Name',
+  '--keyword=Description',
+  '--template=@INPUT@',
+  '-d', po_dir,
+  '--output=@OUTPUT@'
+]
+
 foreach plugin: plugins
   subdir(plugin)
 endforeach
diff --git a/src/plugins/ontop/meson.build b/src/plugins/ontop/meson.build
index 54f32f53a..7ec8b3ca2 100644
--- a/src/plugins/ontop/meson.build
+++ b/src/plugins/ontop/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/ontop/ontop.plugin.in b/src/plugins/ontop/ontop.plugin.in
index f1e9bc62e..3c41e3c05 100644
--- a/src/plugins/ontop/ontop.plugin.in
+++ b/src/plugins/ontop/ontop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=ontop
 IAge=1
-_Name=Always On Top
-_Description=Keep the main window on top when playing a movie
+Name=Always On Top
+Description=Keep the main window on top when playing a movie
 Authors=Bastien Nocera
 Copyright=Copyright © 2007 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/opensubtitles/meson.build b/src/plugins/opensubtitles/meson.build
index 61ddd6c57..e3370f95d 100644
--- a/src/plugins/opensubtitles/meson.build
+++ b/src/plugins/opensubtitles/meson.build
@@ -19,7 +19,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/opensubtitles/opensubtitles.plugin.in b/src/plugins/opensubtitles/opensubtitles.plugin.in
index 9a9f3e462..5eef71d2d 100644
--- a/src/plugins/opensubtitles/opensubtitles.plugin.in
+++ b/src/plugins/opensubtitles/opensubtitles.plugin.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=opensubtitles
 IAge=1
-_Name=Subtitle Downloader
-_Description=Look for subtitles for the currently playing movie
+Name=Subtitle Downloader
+Description=Look for subtitles for the currently playing movie
 Authors=Xavier Queralt <xqueralt@gmail.com>
 Copyright=Copyright © 2008 Xavier Queralt
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/properties/meson.build b/src/plugins/properties/meson.build
index 47931b8b4..abd0f8b01 100644
--- a/src/plugins/properties/meson.build
+++ b/src/plugins/properties/meson.build
@@ -20,7 +20,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/properties/movie-properties.plugin.in b/src/plugins/properties/movie-properties.plugin.in
index 02bec151f..4b8bdc74d 100644
--- a/src/plugins/properties/movie-properties.plugin.in
+++ b/src/plugins/properties/movie-properties.plugin.in
@@ -2,8 +2,8 @@
 Module=movie-properties
 IAge=1
 Builtin=true
-_Name=Movie Properties
-_Description=Adds movie properties menu item
+Name=Movie Properties
+Description=Adds movie properties menu item
 Authors=Bastien Nocera
 Copyright=Copyright © 2007 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/pythonconsole/meson.build b/src/plugins/pythonconsole/meson.build
index 443b1118f..c36c5a302 100644
--- a/src/plugins/pythonconsole/meson.build
+++ b/src/plugins/pythonconsole/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/pythonconsole/pythonconsole.plugin.in b/src/plugins/pythonconsole/pythonconsole.plugin.in
index b384c4a28..c5ee8ebe4 100644
--- a/src/plugins/pythonconsole/pythonconsole.plugin.in
+++ b/src/plugins/pythonconsole/pythonconsole.plugin.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=pythonconsole
 IAge=1
-_Name=Python Console
-_Description=Interactive Python console
+Name=Python Console
+Description=Interactive Python console
 Authors=Steve Frécinaux <steve@istique.net>
 Copyright=Copyright © 2006 Steve Frécinaux
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/recent/meson.build b/src/plugins/recent/meson.build
index c3d024f18..40c0a6891 100644
--- a/src/plugins/recent/meson.build
+++ b/src/plugins/recent/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/recent/recent.plugin.in b/src/plugins/recent/recent.plugin.in
index d7a8346cd..c2c5c0962 100644
--- a/src/plugins/recent/recent.plugin.in
+++ b/src/plugins/recent/recent.plugin.in
@@ -2,8 +2,8 @@
 Module=recent
 IAge=1
 Builtin=true
-_Name=Recent files
-_Description=Adds files that have been played to recent files
+Name=Recent files
+Description=Adds files that have been played to recent files
 Authors=Bastien Nocera
 Copyright=Copyright © 2012 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/rotation/meson.build b/src/plugins/rotation/meson.build
index 14025f63b..07a3b6b3b 100644
--- a/src/plugins/rotation/meson.build
+++ b/src/plugins/rotation/meson.build
@@ -37,7 +37,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/rotation/rotation.plugin.in b/src/plugins/rotation/rotation.plugin.in
index 02fbd9890..5eadb7a82 100644
--- a/src/plugins/rotation/rotation.plugin.in
+++ b/src/plugins/rotation/rotation.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=rotation
 IAge=1
-_Name=Rotation Plugin
-_Description=Allows videos to be rotated if they are in the wrong orientation
+Name=Rotation Plugin
+Description=Allows videos to be rotated if they are in the wrong orientation
 Authors=Simon Wenner <simon@wenner.ch>
 Copyright=Copyright © 2011 Simon Wenner
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/sample-vala/meson.build b/src/plugins/sample-vala/meson.build
index fca79d37c..c5215d68b 100644
--- a/src/plugins/sample-vala/meson.build
+++ b/src/plugins/sample-vala/meson.build
@@ -26,7 +26,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: plugin_install,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/sample-vala/sample-vala.plugin.in b/src/plugins/sample-vala/sample-vala.plugin.in
index 2edfdf7e7..1db8fabba 100644
--- a/src/plugins/sample-vala/sample-vala.plugin.in
+++ b/src/plugins/sample-vala/sample-vala.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=sample-vala
 IAge=1
-_Name=Vala Sample Plugin
-_Description=A useless sample plugin in Vala
+Name=Vala Sample Plugin
+Description=A useless sample plugin in Vala
 Authors=Philip Withnall <philip@tecnocode.co.uk>
 Copyright=Copyright © 2007 James Livingston, Philip Withnall
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/samplepython/meson.build b/src/plugins/samplepython/meson.build
index e89e038fb..a18c0830d 100644
--- a/src/plugins/samplepython/meson.build
+++ b/src/plugins/samplepython/meson.build
@@ -17,7 +17,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: plugin_install,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/samplepython/samplepython.plugin.in b/src/plugins/samplepython/samplepython.plugin.in
index c181497f9..8edef454b 100644
--- a/src/plugins/samplepython/samplepython.plugin.in
+++ b/src/plugins/samplepython/samplepython.plugin.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=samplepython
 IAge=1
-_Name=Python Sample Plugin
-_Description=A useless sample plugin in Python
+Name=Python Sample Plugin
+Description=A useless sample plugin in Python
 Authors=Philip Withnall <philip@tecnocode.co.uk>
 Copyright=Copyright © 2006 James Livingston, 2007 Philip Withnall
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/save-file/meson.build b/src/plugins/save-file/meson.build
index 0ac157d7c..dc2cce709 100644
--- a/src/plugins/save-file/meson.build
+++ b/src/plugins/save-file/meson.build
@@ -21,7 +21,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/save-file/save-file.plugin.in b/src/plugins/save-file/save-file.plugin.in
index a2d638373..37f406f0b 100644
--- a/src/plugins/save-file/save-file.plugin.in
+++ b/src/plugins/save-file/save-file.plugin.in
@@ -2,8 +2,8 @@
 Module=save-file
 IAge=1
 Builtin=true
-_Name=Save Copy
-_Description=Save a copy of the currently playing movie
+Name=Save Copy
+Description=Save a copy of the currently playing movie
 Authors=Bastien Nocera
 Copyright=Copyright © 2010 Bastien Nocera
 Website=https://wiki.gnome.org/Apps/Videos
diff --git a/src/plugins/screensaver/meson.build b/src/plugins/screensaver/meson.build
index 5c398c770..3b5c1721e 100644
--- a/src/plugins/screensaver/meson.build
+++ b/src/plugins/screensaver/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/screensaver/screensaver.plugin.in b/src/plugins/screensaver/screensaver.plugin.in
index 2e8da4917..a31e436d2 100644
--- a/src/plugins/screensaver/screensaver.plugin.in
+++ b/src/plugins/screensaver/screensaver.plugin.in
@@ -2,8 +2,8 @@
 Module=screensaver
 IAge=1
 Builtin=true
-_Name=Screen Saver
-_Description=Deactivates the screen saver when a movie is playing
+Name=Screen Saver
+Description=Deactivates the screen saver when a movie is playing
 Authors=Bastien Nocera
 Copyright=Copyright © 2007 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/screenshot/meson.build b/src/plugins/screenshot/meson.build
index 70dcbb90c..a03721578 100644
--- a/src/plugins/screenshot/meson.build
+++ b/src/plugins/screenshot/meson.build
@@ -38,7 +38,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/screenshot/screenshot.plugin.in b/src/plugins/screenshot/screenshot.plugin.in
index dd2957284..ce0c1fa27 100644
--- a/src/plugins/screenshot/screenshot.plugin.in
+++ b/src/plugins/screenshot/screenshot.plugin.in
@@ -2,8 +2,8 @@
 Module=screenshot
 IAge=1
 Builtin=true
-_Name=Screenshot
-_Description=Allows screenshots and galleries to be taken of videos
+Name=Screenshot
+Description=Allows screenshots and galleries to be taken of videos
 Authors=Philip Withnall, Bastien Nocera
 Copyright=Copyright © 2008 Philip Withnall, 2004 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/skipto/meson.build b/src/plugins/skipto/meson.build
index a175d4462..0b933b879 100644
--- a/src/plugins/skipto/meson.build
+++ b/src/plugins/skipto/meson.build
@@ -24,7 +24,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/skipto/skipto.plugin.in b/src/plugins/skipto/skipto.plugin.in
index 484c8fbb3..5575660f9 100644
--- a/src/plugins/skipto/skipto.plugin.in
+++ b/src/plugins/skipto/skipto.plugin.in
@@ -2,8 +2,8 @@
 Module=skipto
 IAge=1
 Builtin=true
-_Name=Skip To
-_Description=Provides the “Skip to” dialog
+Name=Skip To
+Description=Provides the “Skip to” dialog
 Authors=Philip Withnall, Bastien Nocera
 Copyright=Copyright © 2007 Philip Withnall
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/variable-rate/meson.build b/src/plugins/variable-rate/meson.build
index 53761fbb3..b9c2b28b1 100644
--- a/src/plugins/variable-rate/meson.build
+++ b/src/plugins/variable-rate/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/variable-rate/variable-rate.plugin.in b/src/plugins/variable-rate/variable-rate.plugin.in
index 1353e8db2..57e5d7ffe 100644
--- a/src/plugins/variable-rate/variable-rate.plugin.in
+++ b/src/plugins/variable-rate/variable-rate.plugin.in
@@ -2,8 +2,8 @@
 Module=variable-rate
 IAge=1
 Builtin=true
-_Name=Variable Rate
-_Description=Provides the variable rate menu item
+Name=Variable Rate
+Description=Provides the variable rate menu item
 Authors=Bastien Nocera
 Copyright=Copyright © 2016 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/vimeo/meson.build b/src/plugins/vimeo/meson.build
index c89b16b02..155ba9b85 100644
--- a/src/plugins/vimeo/meson.build
+++ b/src/plugins/vimeo/meson.build
@@ -18,7 +18,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/vimeo/vimeo.plugin.in b/src/plugins/vimeo/vimeo.plugin.in
index f18b6eb46..1856dbb39 100644
--- a/src/plugins/vimeo/vimeo.plugin.in
+++ b/src/plugins/vimeo/vimeo.plugin.in
@@ -2,8 +2,8 @@
 Module=vimeo
 IAge=1
 Builtin=true
-_Name=Vimeo
-_Description=Sets the user agent for the Vimeo site
+Name=Vimeo
+Description=Sets the user agent for the Vimeo site
 Authors=Bastien Nocera
 Copyright=Copyright © 2013 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff --git a/src/plugins/zeitgeist-dp/meson.build b/src/plugins/zeitgeist-dp/meson.build
index d89d9addf..a5ecae1f2 100644
--- a/src/plugins/zeitgeist-dp/meson.build
+++ b/src/plugins/zeitgeist-dp/meson.build
@@ -37,7 +37,7 @@ custom_target(
   plugin_data,
   input: plugin_data + '.in',
   output: plugin_data,
-  command: intltool_desktop_cmd,
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: plugin_dir
 )
diff --git a/src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in b/src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in
index 71a690825..85580987a 100644
--- a/src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in
+++ b/src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=totem-zeitgeist-dp-plugin
 IAge=1
-_Name=Zeitgeist Plugin
-_Description=A plugin sending events to Zeitgeist
+Name=Zeitgeist Plugin
+Description=A plugin sending events to Zeitgeist
 Authors=Michal Hruby <michal.mhr@gmail.com>
 Copyright=Copyright © 2010 Michal Hruby
 Website=http://www.gnome.org/projects/totem/