GNOME.org
 

[rhythmbox/wip/hadess/use-gettext] plugins: Use gettext to translate all the plugin definitions


commit 4c0950eaea4b273cb487f2398aa2b598d185d7ec
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Oct 20 11:43:40 2021 +0200

    plugins: Use gettext to translate all the plugin definitions
    
    Requires renaming the plugin files from .plugin.in to .plugin.desktop.in
    so that gettext will know how to merge the translations into it.

 ...android.plugin.in => android.desktop.plugin.in} |  4 +-
 plugins/android/meson.build                        |  4 +-
 ...earch.plugin.in => artsearch.desktop.plugin.in} |  4 +-
 plugins/artsearch/meson.build                      |  4 +-
 ...audiocd.plugin.in => audiocd.desktop.plugin.in} |  4 +-
 plugins/audiocd/meson.build                        |  4 +-
 ....plugin.in => audioscrobbler.desktop.plugin.in} |  4 +-
 plugins/audioscrobbler/meson.build                 |  4 +-
 ...der.plugin.in => cd-recorder.desktop.plugin.in} |  4 +-
 plugins/brasero-disc-recorder/meson.build          |  4 +-
 ...context.plugin.in => context.desktop.plugin.in} |  4 +-
 plugins/context/meson.build                        |  4 +-
 .../{daap.plugin.in => daap.desktop.plugin.in}     |  4 +-
 plugins/daap/meson.build                           |  4 +-
 ...ugin.in => dbus-media-server.desktop.plugin.in} |  4 +-
 plugins/dbus-media-server/meson.build              |  4 +-
 ...fmradio.plugin.in => fmradio.desktop.plugin.in} |  4 +-
 plugins/fmradio/meson.build                        |  4 +-
 ....plugin.in => generic-player.desktop.plugin.in} |  4 +-
 plugins/generic-player/meson.build                 |  4 +-
 .../{grilo.plugin.in => grilo.desktop.plugin.in}   |  4 +-
 plugins/grilo/meson.build                          |  4 +-
 ...tatus.plugin.in => im-status.desktop.plugin.in} |  4 +-
 plugins/im-status/meson.build                      |  4 +-
 .../{ipod.plugin.in => ipod.desktop.plugin.in}     |  4 +-
 plugins/ipod/meson.build                           |  4 +-
 .../{iradio.plugin.in => iradio.desktop.plugin.in} |  4 +-
 plugins/iradio/meson.build                         |  4 +-
 plugins/lirc/meson.build                           |  4 +-
 .../{rblirc.plugin.in => rblirc.desktop.plugin.in} |  4 +-
 ...nz.plugin.in => listenbrainz.desktop.plugin.in} |  4 +-
 plugins/listenbrainz/meson.build                   |  4 +-
 .../{lyrics.plugin.in => lyrics.desktop.plugin.in} |  4 +-
 plugins/lyrics/meson.build                         |  4 +-
 ...atune.plugin.in => magnatune.desktop.plugin.in} |  4 +-
 plugins/magnatune/meson.build                      |  4 +-
 plugins/meson.build                                | 13 +++++
 plugins/mmkeys/meson.build                         |  4 +-
 .../{mmkeys.plugin.in => mmkeys.desktop.plugin.in} |  4 +-
 plugins/mpris/meson.build                          |  4 +-
 .../{mpris.plugin.in => mpris.desktop.plugin.in}   |  4 +-
 plugins/mtpdevice/meson.build                      |  4 +-
 ...evice.plugin.in => mtpdevice.desktop.plugin.in} |  4 +-
 plugins/notification/meson.build                   |  4 +-
 ...on.plugin.in => notification.desktop.plugin.in} |  4 +-
 plugins/power-manager/meson.build                  |  4 +-
 ...r.plugin.in => power-manager.desktop.plugin.in} |  4 +-
 plugins/pythonconsole/meson.build                  |  4 +-
 ...e.plugin.in => pythonconsole.desktop.plugin.in} |  4 +-
 plugins/rbzeitgeist/meson.build                    |  4 +-
 ...ist.plugin.in => rbzeitgeist.desktop.plugin.in} |  4 +-
 plugins/replaygain/meson.build                     |  4 +-
 ...gain.plugin.in => replaygain.desktop.plugin.in} |  4 +-
 plugins/soundcloud/meson.build                     |  4 +-
 ...loud.plugin.in => soundcloud.desktop.plugin.in} |  4 +-
 plugins/webremote/meson.build                      |  4 +-
 ...emote.plugin.in => webremote.desktop.plugin.in} |  4 +-
 po/POTFILES.in                                     | 62 +++++++++++-----------
 sample-plugins/sample-python/meson.build           |  4 +-
 ...n.plugin.in => sample-python.desktop.plugin.in} |  4 +-
 sample-plugins/sample-vala/meson.build             |  4 +-
 ...ala.plugin.in => sample-vala.desktop.plugin.in} |  4 +-
 sample-plugins/sample/meson.build                  |  4 +-
 .../{sample.plugin.in => sample.desktop.plugin.in} |  4 +-
 64 files changed, 168 insertions(+), 155 deletions(-)
---
diff --git a/plugins/android/android.plugin.in b/plugins/android/android.desktop.plugin.in
similarity index 70%
rename from plugins/android/android.plugin.in
rename to plugins/android/android.desktop.plugin.in
index 353c4e2d9..e37dbb8f3 100644
--- a/plugins/android/android.plugin.in
+++ b/plugins/android/android.desktop.plugin.in
@@ -2,8 +2,8 @@
 Module=android
 IAge=2
 Builtin=true
-_Name=Android devices
-_Description=Support for Android 4.0+ devices (via MTP)
+Name=Android devices
+Description=Support for Android 4.0+ devices (via MTP)
 Authors=Jonathan Matthew
 Copyright=Copyright © 2015 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/android/meson.build b/plugins/android/meson.build
index bee06158b..21395e0f3 100644
--- a/plugins/android/meson.build
+++ b/plugins/android/meson.build
@@ -18,8 +18,8 @@ shared_module('android',
   install_dir: android_plugin_dir)
 
 android_plugin_descriptor = custom_target('android-plugin-descriptor',
-  input: 'android.plugin.in',
+  input: 'android.desktop.plugin.in',
   output: 'android.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: android_plugin_dir)
diff --git a/plugins/artsearch/artsearch.plugin.in b/plugins/artsearch/artsearch.desktop.plugin.in
similarity index 75%
rename from plugins/artsearch/artsearch.plugin.in
rename to plugins/artsearch/artsearch.desktop.plugin.in
index 5f4929d15..92d67a579 100644
--- a/plugins/artsearch/artsearch.plugin.in
+++ b/plugins/artsearch/artsearch.desktop.plugin.in
@@ -3,8 +3,8 @@ Loader=python3
 Module=artsearch
 IAge=2
 Depends=rb
-_Name=Cover art search
-_Description=Fetch album covers from the Internet
+Name=Cover art search
+Description=Fetch album covers from the Internet
 Authors=Jonathan Matthew <jonathan d14n org>
 Copyright=Copyright © 2011 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/artsearch/meson.build b/plugins/artsearch/meson.build
index 1bba92056..5a0daf4eb 100644
--- a/plugins/artsearch/meson.build
+++ b/plugins/artsearch/meson.build
@@ -13,8 +13,8 @@ install_data(artsearch_plugin_files,
   install_dir: artsearch_plugin_dir)
 
 artsearch_plugin_descriptor = custom_target('artsearch-plugin-descriptor',
-  input: 'artsearch.plugin.in',
+  input: 'artsearch.desktop.plugin.in',
   output: 'artsearch.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: artsearch_plugin_dir)
diff --git a/plugins/audiocd/audiocd.plugin.in b/plugins/audiocd/audiocd.desktop.plugin.in
similarity index 70%
rename from plugins/audiocd/audiocd.plugin.in
rename to plugins/audiocd/audiocd.desktop.plugin.in
index 6db8239a8..4a3ff8125 100644
--- a/plugins/audiocd/audiocd.plugin.in
+++ b/plugins/audiocd/audiocd.desktop.plugin.in
@@ -2,8 +2,8 @@
 Module=audiocd
 IAge=2
 Builtin=true
-_Name=Audio CD Player
-_Description=Support for playing of audio CDs as music source
+Name=Audio CD Player
+Description=Support for playing of audio CDs as music source
 Authors=James Livingston, Jonathan Matthew
 Copyright=Copyright © 2005-2006 James Livingston, Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/audiocd/meson.build b/plugins/audiocd/meson.build
index d6a9ed65f..1bfa055aa 100644
--- a/plugins/audiocd/meson.build
+++ b/plugins/audiocd/meson.build
@@ -19,9 +19,9 @@ shared_module('audiocd',
   install_dir: audiocd_plugin_dir)
 
 audiocd_plugin_descriptor = custom_target('audiocd-plugin-descriptor',
-  input: 'audiocd.plugin.in',
+  input: 'audiocd.desktop.plugin.in',
   output: 'audiocd.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: audiocd_plugin_dir)
 
diff --git a/plugins/audioscrobbler/audioscrobbler.plugin.in 
b/plugins/audioscrobbler/audioscrobbler.desktop.plugin.in
similarity index 72%
rename from plugins/audioscrobbler/audioscrobbler.plugin.in
rename to plugins/audioscrobbler/audioscrobbler.desktop.plugin.in
index c802c7c3c..3a7c93fc5 100644
--- a/plugins/audioscrobbler/audioscrobbler.plugin.in
+++ b/plugins/audioscrobbler/audioscrobbler.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=audioscrobbler
 IAge=2
-_Name=Last.fm
-_Description=Submits song information to Last.fm and plays Last.fm radio streams
+Name=Last.fm
+Description=Submits song information to Last.fm and plays Last.fm radio streams
 Authors=Alex Revo <xiphoidappendix gmail com>;Ruben Vermeersch <ruben Lambda1 be>
 Copyright=Copyright © 2005-2006 Alex Revo, Ruben Vermeersch
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/audioscrobbler/meson.build b/plugins/audioscrobbler/meson.build
index 92d4bedcb..c48a3f2db 100644
--- a/plugins/audioscrobbler/meson.build
+++ b/plugins/audioscrobbler/meson.build
@@ -25,9 +25,9 @@ shared_module('audioscrobbler',
   install_dir: audioscrobbler_plugin_dir)
 
 audioscrobbler_plugin_descriptor = custom_target('audioscrobbler-plugin-descriptor',
-  input: 'audioscrobbler.plugin.in',
+  input: 'audioscrobbler.desktop.plugin.in',
   output: 'audioscrobbler.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: audioscrobbler_plugin_dir)
 
diff --git a/plugins/brasero-disc-recorder/cd-recorder.plugin.in 
b/plugins/brasero-disc-recorder/cd-recorder.desktop.plugin.in
similarity index 71%
rename from plugins/brasero-disc-recorder/cd-recorder.plugin.in
rename to plugins/brasero-disc-recorder/cd-recorder.desktop.plugin.in
index e8b06f592..d760926cb 100644
--- a/plugins/brasero-disc-recorder/cd-recorder.plugin.in
+++ b/plugins/brasero-disc-recorder/cd-recorder.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=cd-recorder
 IAge=2
-_Name=Audio CD Recorder
-_Description=Record audio CDs from playlists and duplicate audio CDs
+Name=Audio CD Recorder
+Description=Record audio CDs from playlists and duplicate audio CDs
 Authors=William Jon McCann, Rouquier Philippe
 Copyright=Copyright © 2006 William Jon McCann, © 2008-2009 Rouquier Philippe
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/brasero-disc-recorder/meson.build b/plugins/brasero-disc-recorder/meson.build
index 952fe2e2c..723d0dd62 100644
--- a/plugins/brasero-disc-recorder/meson.build
+++ b/plugins/brasero-disc-recorder/meson.build
@@ -13,8 +13,8 @@ shared_module('cd-recorder',
   install_dir: brasero_disc_recorder_plugin_dir)
 
 brasero_disc_recorder_plugin_descriptor = custom_target('brasero-disc-recorder-plugin-descriptor',
-  input: 'cd-recorder.plugin.in',
+  input: 'cd-recorder.desktop.plugin.in',
   output: 'cd-recorder.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: brasero_disc_recorder_plugin_dir)
diff --git a/plugins/context/context.plugin.in b/plugins/context/context.desktop.plugin.in
similarity index 65%
rename from plugins/context/context.plugin.in
rename to plugins/context/context.desktop.plugin.in
index 86271e0d6..567d4e297 100644
--- a/plugins/context/context.plugin.in
+++ b/plugins/context/context.desktop.plugin.in
@@ -3,8 +3,8 @@ Loader=python3
 Module=context
 IAge=2
 Depends=rb
-_Name=Context Pane
-_Description=Show information related to the currently playing artist and song.
+Name=Context Pane
+Description=Show information related to the currently playing artist and song.
 Authors=John Iacona <plate0salad gmail com>
 Copyright=Copyright © 2009 John Iacona
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/context/meson.build b/plugins/context/meson.build
index 888beadde..2cbc0aea7 100644
--- a/plugins/context/meson.build
+++ b/plugins/context/meson.build
@@ -15,9 +15,9 @@ install_data(context_plugin_files,
   install_dir: context_plugin_dir)
 
 context_plugin_descriptor = custom_target('context-plugin-descriptor',
-  input: 'context.plugin.in',
+  input: 'context.desktop.plugin.in',
   output: 'context.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: context_plugin_dir)
 
diff --git a/plugins/daap/daap.plugin.in b/plugins/daap/daap.desktop.plugin.in
similarity index 72%
rename from plugins/daap/daap.plugin.in
rename to plugins/daap/daap.desktop.plugin.in
index fbd5384cb..99c7339e3 100644
--- a/plugins/daap/daap.plugin.in
+++ b/plugins/daap/daap.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=daap
 IAge=2
-_Name=DAAP Music Sharing
-_Description=Share music and play shared music on your local network
+Name=DAAP Music Sharing
+Description=Share music and play shared music on your local network
 Authors=Charles Schmidt  <cschmidt2 emich edu>, the Rhythmbox Developers
 Copyright=Copyright © 2005-2006 Charles Schmidt, the Rhythmbox Developers
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/daap/meson.build b/plugins/daap/meson.build
index 8bc0239a2..585f4aa7a 100644
--- a/plugins/daap/meson.build
+++ b/plugins/daap/meson.build
@@ -35,8 +35,8 @@ shared_module('daap',
   install_dir: daap_plugin_dir)
 
 daap_plugin_descriptor = custom_target('daap-plugin-descriptor',
-  input: 'daap.plugin.in',
+  input: 'daap.desktop.plugin.in',
   output: 'daap.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: daap_plugin_dir)
diff --git a/plugins/dbus-media-server/dbus-media-server.plugin.in 
b/plugins/dbus-media-server/dbus-media-server.desktop.plugin.in
similarity index 59%
rename from plugins/dbus-media-server/dbus-media-server.plugin.in
rename to plugins/dbus-media-server/dbus-media-server.desktop.plugin.in
index 893070807..65a398312 100644
--- a/plugins/dbus-media-server/dbus-media-server.plugin.in
+++ b/plugins/dbus-media-server/dbus-media-server.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=dbus-media-server
 IAge=2
-_Name=MediaServer2 D-Bus interface
-_Description=Provides an implementation of the MediaServer2 D-Bus interface specification
+Name=MediaServer2 D-Bus interface
+Description=Provides an implementation of the MediaServer2 D-Bus interface specification
 Authors=Jonathan Matthew
 Copyright=Copyright © 2010 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/dbus-media-server/meson.build b/plugins/dbus-media-server/meson.build
index 6902bc4bb..878bf2285 100644
--- a/plugins/dbus-media-server/meson.build
+++ b/plugins/dbus-media-server/meson.build
@@ -13,8 +13,8 @@ shared_module('dbus-media-server',
   install_dir: dbus_media_server_plugin_dir)
 
 dbus_media_server_plugin_descriptor = custom_target('dbus-media-server-plugin-descriptor',
-  input: 'dbus-media-server.plugin.in',
+  input: 'dbus-media-server.desktop.plugin.in',
   output: 'dbus-media-server.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: dbus_media_server_plugin_dir)
diff --git a/plugins/fmradio/fmradio.plugin.in b/plugins/fmradio/fmradio.desktop.plugin.in
similarity index 67%
rename from plugins/fmradio/fmradio.plugin.in
rename to plugins/fmradio/fmradio.desktop.plugin.in
index 2c1d9ba20..daac3a962 100644
--- a/plugins/fmradio/fmradio.plugin.in
+++ b/plugins/fmradio/fmradio.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=fmradio
 IAge=2
-_Name=FM Radio
-_Description=Support for FM radio broadcasting services
+Name=FM Radio
+Description=Support for FM radio broadcasting services
 Authors=James Henstridge
 Copyright=Copyright © 2007 James Henstridge
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/fmradio/meson.build b/plugins/fmradio/meson.build
index 2aafdb64b..43fbbbf90 100644
--- a/plugins/fmradio/meson.build
+++ b/plugins/fmradio/meson.build
@@ -21,8 +21,8 @@ shared_module('fmradio',
   install_dir: fmradio_plugin_dir)
 
 fmradio_plugin_descriptor = custom_target('fmradio-plugin-descriptor',
-  input: 'fmradio.plugin.in',
+  input: 'fmradio.desktop.plugin.in',
   output: 'fmradio.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: fmradio_plugin_dir)
diff --git a/plugins/generic-player/generic-player.plugin.in 
b/plugins/generic-player/generic-player.desktop.plugin.in
similarity index 67%
rename from plugins/generic-player/generic-player.plugin.in
rename to plugins/generic-player/generic-player.desktop.plugin.in
index 927b45e49..a2bb67f64 100644
--- a/plugins/generic-player/generic-player.plugin.in
+++ b/plugins/generic-player/generic-player.desktop.plugin.in
@@ -2,8 +2,8 @@
 Module=generic-player
 IAge=2
 Builtin=true
-_Name=Portable Players
-_Description=Support for generic audio player devices (plus PSP and Nokia 770)
+Name=Portable Players
+Description=Support for generic audio player devices (plus PSP and Nokia 770)
 Authors=James Livingston, Jonathan Matthew
 Copyright=Copyright © 2005-2006 James Livingston, Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/generic-player/meson.build b/plugins/generic-player/meson.build
index 97650c96d..c5a928ac7 100644
--- a/plugins/generic-player/meson.build
+++ b/plugins/generic-player/meson.build
@@ -21,8 +21,8 @@ shared_module('generic-player',
   install_dir: generic_player_plugin_dir)
 
 generic_player_plugin_descriptor = custom_target('generic-player-plugin-descriptor',
-  input: 'generic-player.plugin.in',
+  input: 'generic-player.desktop.plugin.in',
   output: 'generic-player.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: generic_player_plugin_dir)
diff --git a/plugins/grilo/grilo.plugin.in b/plugins/grilo/grilo.desktop.plugin.in
similarity index 62%
rename from plugins/grilo/grilo.plugin.in
rename to plugins/grilo/grilo.desktop.plugin.in
index 20b8af0da..1d34b5aaf 100644
--- a/plugins/grilo/grilo.plugin.in
+++ b/plugins/grilo/grilo.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=grilo
 IAge=2
-_Name=Grilo media browser
-_Description=Browse various local and Internet media sources
+Name=Grilo media browser
+Description=Browse various local and Internet media sources
 Authors=Jonathan Matthew
 Copyright=Copyright © 2011 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/grilo/meson.build b/plugins/grilo/meson.build
index 980e6c428..ca4ef6766 100644
--- a/plugins/grilo/meson.build
+++ b/plugins/grilo/meson.build
@@ -16,8 +16,8 @@ shared_module('grilo',
   install_dir: grilo_plugin_dir)
 
 grilo_plugin_descriptor = custom_target('grilo-plugin-descriptor',
-  input: 'grilo.plugin.in',
+  input: 'grilo.desktop.plugin.in',
   output: 'grilo.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: grilo_plugin_dir)
diff --git a/plugins/im-status/im-status.plugin.in b/plugins/im-status/im-status.desktop.plugin.in
similarity index 61%
rename from plugins/im-status/im-status.plugin.in
rename to plugins/im-status/im-status.desktop.plugin.in
index d9c2cbdaf..75818d0e7 100644
--- a/plugins/im-status/im-status.plugin.in
+++ b/plugins/im-status/im-status.desktop.plugin.in
@@ -3,8 +3,8 @@ Loader=python3
 Module=im-status
 IAge=2
 Depends=rb
-_Name=IM Status
-_Description=Updates IM status according to the current song (works with Empathy and Pidgin)
+Name=IM Status
+Description=Updates IM status according to the current song (works with Empathy and Pidgin)
 Authors=Vincent Untz <vuntz gnome org>
 Copyright=Copyright © 2007-2008 Vincent Untz
 Website=http://www.vuntz.net/
diff --git a/plugins/im-status/meson.build b/plugins/im-status/meson.build
index 9ae65e42e..c03d91e82 100644
--- a/plugins/im-status/meson.build
+++ b/plugins/im-status/meson.build
@@ -7,8 +7,8 @@ install_data(im_status_plugin_files,
   install_dir: im_status_plugin_dir)
 
 im_status_plugin_descriptor = custom_target('im-status-plugin-descriptor',
-  input: 'im-status.plugin.in',
+  input: 'im-status.desktop.plugin.in',
   output: 'im-status.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: im_status_plugin_dir)
diff --git a/plugins/ipod/ipod.plugin.in b/plugins/ipod/ipod.desktop.plugin.in
similarity index 63%
rename from plugins/ipod/ipod.plugin.in
rename to plugins/ipod/ipod.desktop.plugin.in
index b6a27ca84..c2aff0da8 100644
--- a/plugins/ipod/ipod.plugin.in
+++ b/plugins/ipod/ipod.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=ipod
 IAge=2
-_Name=Portable Players - iPod
-_Description=Support for Apple iPod devices (show the content, play from device)
+Name=Portable Players - iPod
+Description=Support for Apple iPod devices (show the content, play from device)
 Authors=James Livingston, Christophe Fergeau
 Copyright=Copyright © 2006 James Livingston
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/ipod/meson.build b/plugins/ipod/meson.build
index bad79b601..6f4ebdfad 100644
--- a/plugins/ipod/meson.build
+++ b/plugins/ipod/meson.build
@@ -24,8 +24,8 @@ shared_module('ipod',
   install_dir: ipod_plugin_dir)
 
 ipod_plugin_descriptor = custom_target('ipod-plugin-descriptor',
-  input: 'ipod.plugin.in',
+  input: 'ipod.desktop.plugin.in',
   output: 'ipod.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: ipod_plugin_dir)
diff --git a/plugins/iradio/iradio.plugin.in b/plugins/iradio/iradio.desktop.plugin.in
similarity index 63%
rename from plugins/iradio/iradio.plugin.in
rename to plugins/iradio/iradio.desktop.plugin.in
index 48461dce2..bb0c325a3 100644
--- a/plugins/iradio/iradio.plugin.in
+++ b/plugins/iradio/iradio.desktop.plugin.in
@@ -2,8 +2,8 @@
 Module=iradio
 Builtin=true
 IAge=2
-_Name=Internet Radio
-_Description=Support for broadcasting services transmitted via the Internet
+Name=Internet Radio
+Description=Support for broadcasting services transmitted via the Internet
 Authors=Rhythmbox authors
 Copyright=Copyright © 2002-2006 Rhythmbox authors
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/iradio/meson.build b/plugins/iradio/meson.build
index fa5226591..c681c58b2 100644
--- a/plugins/iradio/meson.build
+++ b/plugins/iradio/meson.build
@@ -23,8 +23,8 @@ shared_module('iradio',
   install_dir: iradio_plugin_dir)
 
 iradio_plugin_descriptor = custom_target('iradio-plugin-descriptor',
-  input: 'iradio.plugin.in',
+  input: 'iradio.desktop.plugin.in',
   output: 'iradio.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: iradio_plugin_dir)
diff --git a/plugins/lirc/meson.build b/plugins/lirc/meson.build
index 7df0e3cae..28e178543 100644
--- a/plugins/lirc/meson.build
+++ b/plugins/lirc/meson.build
@@ -13,9 +13,9 @@ shared_module('rblirc',
   install: true)
 
 lirc_plugin_descriptor = custom_target('lirc-plugin-descriptor',
-  input: 'rblirc.plugin.in',
+  input: 'rblirc.desktop.plugin.in',
   output: 'rblirc.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: lirc_plugin_dir)
 
diff --git a/plugins/lirc/rblirc.plugin.in b/plugins/lirc/rblirc.desktop.plugin.in
similarity index 68%
rename from plugins/lirc/rblirc.plugin.in
rename to plugins/lirc/rblirc.desktop.plugin.in
index 4b4c86637..d35a95ff2 100644
--- a/plugins/lirc/rblirc.plugin.in
+++ b/plugins/lirc/rblirc.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=rblirc
 IAge=2
-_Name=LIRC
-_Description=Control Rhythmbox using an infrared remote control
+Name=LIRC
+Description=Control Rhythmbox using an infrared remote control
 Authors=Jonathan Matthew <jonathan d14n org>
 Copyright=Copyright © 2006 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/listenbrainz/listenbrainz.plugin.in b/plugins/listenbrainz/listenbrainz.desktop.plugin.in
similarity index 75%
rename from plugins/listenbrainz/listenbrainz.plugin.in
rename to plugins/listenbrainz/listenbrainz.desktop.plugin.in
index 8c48040c1..789c0682a 100644
--- a/plugins/listenbrainz/listenbrainz.plugin.in
+++ b/plugins/listenbrainz/listenbrainz.desktop.plugin.in
@@ -3,8 +3,8 @@ Loader=python3
 Module=listenbrainz
 Depends=rb
 IAge=2
-_Name=ListenBrainz
-_Description=Submit your listens to ListenBrainz
+Name=ListenBrainz
+Description=Submit your listens to ListenBrainz
 Authors=Philipp Wolfer <ph wolfer gmail com>
 Copyright=Copyright © 2018 Philipp Wolfer
 Website=https://github.com/phw/rhythmbox-plugin-listenbrainz
diff --git a/plugins/listenbrainz/meson.build b/plugins/listenbrainz/meson.build
index 03c3c1728..95f96fc90 100644
--- a/plugins/listenbrainz/meson.build
+++ b/plugins/listenbrainz/meson.build
@@ -15,8 +15,8 @@ install_data(['settings.ui'],
   install_dir: listenbrainz_plugin_data_dir)
 
 listenbrainz_plugin_descriptor = custom_target('listenbrainz-plugin-descriptor',
-  input: 'listenbrainz.plugin.in',
+  input: 'listenbrainz.desktop.plugin.in',
   output: 'listenbrainz.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: listenbrainz_plugin_dir)
diff --git a/plugins/lyrics/lyrics.plugin.in b/plugins/lyrics/lyrics.desktop.plugin.in
similarity index 78%
rename from plugins/lyrics/lyrics.plugin.in
rename to plugins/lyrics/lyrics.desktop.plugin.in
index 8b85ed9e5..ad273073b 100644
--- a/plugins/lyrics/lyrics.plugin.in
+++ b/plugins/lyrics/lyrics.desktop.plugin.in
@@ -3,8 +3,8 @@ Loader=python3
 Module=lyrics
 IAge=2
 Depends=rb
-_Name=Song Lyrics
-_Description=Fetch song lyrics from the Internet
+Name=Song Lyrics
+Description=Fetch song lyrics from the Internet
 Authors=Jonathan Matthew, Eduardo Gonzalez, Sirio Bolaños
 Copyright=Copyright © 2005-2007 Jonathan Matthew, Eduardo Gonzalez, Sirio Bolaños
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/lyrics/meson.build b/plugins/lyrics/meson.build
index a3652969f..b39627993 100644
--- a/plugins/lyrics/meson.build
+++ b/plugins/lyrics/meson.build
@@ -18,9 +18,9 @@ install_data(lyrics_plugin_files,
   install_dir: lyrics_plugin_dir)
 
 lyrics_plugin_descriptor = custom_target('lyrics-plugin-descriptor',
-  input: 'lyrics.plugin.in',
+  input: 'lyrics.desktop.plugin.in',
   output: 'lyrics.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: lyrics_plugin_dir)
 
diff --git a/plugins/magnatune/magnatune.plugin.in b/plugins/magnatune/magnatune.desktop.plugin.in
similarity index 60%
rename from plugins/magnatune/magnatune.plugin.in
rename to plugins/magnatune/magnatune.desktop.plugin.in
index 1d46f3b30..83a5cef02 100644
--- a/plugins/magnatune/magnatune.plugin.in
+++ b/plugins/magnatune/magnatune.desktop.plugin.in
@@ -3,8 +3,8 @@ Loader=python3
 Module=magnatune
 IAge=2
 Depends=rb
-_Name=Magnatune Store
-_Description=Adds support to Rhythmbox for playing and purchasing from the Magnatune online music store
+Name=Magnatune Store
+Description=Adds support to Rhythmbox for playing and purchasing from the Magnatune online music store
 Authors=Adam Zimmerman, James Livingston
 Copyright=Copyright © 2006 Adam Zimmerman
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/magnatune/meson.build b/plugins/magnatune/meson.build
index d1768692e..96ff77069 100644
--- a/plugins/magnatune/meson.build
+++ b/plugins/magnatune/meson.build
@@ -12,9 +12,9 @@ install_data(magnatune_plugin_files,
   install_dir: magnatune_plugin_dir)
 
 magnatune_plugin_descriptor = custom_target('magnatune-plugin-descriptor',
-  input: 'magnatune.plugin.in',
+  input: 'magnatune.desktop.plugin.in',
   output: 'magnatune.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: magnatune_plugin_dir)
 
diff --git a/plugins/meson.build b/plugins/meson.build
index 0ec8b8f72..72ef05bec 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -2,6 +2,19 @@ plugin_headers = ['rb-plugin-macros.h']
 
 install_headers(plugin_headers, subdir: 'rhythmbox/plugins')
 
+po_dir = meson.source_root() / 'po'
+# FIXME: Move custom_target to i18n.merge_file when gettext acquires plugin support.
+#        http://lists.gnu.org/archive/html/bug-gettext/2017-06/msg00001.html
+msgfmt_plugin_cmd = [
+  find_program('msgfmt'),
+  '--desktop',
+  '--keyword=Name',
+  '--keyword=Description',
+  '--template=@INPUT@',
+  '-d', po_dir,
+  '--output=@OUTPUT@'
+]
+
 subdir('audiocd')
 subdir('audioscrobbler')
 subdir('dbus-media-server')
diff --git a/plugins/mmkeys/meson.build b/plugins/mmkeys/meson.build
index 1162d022a..5975045f7 100644
--- a/plugins/mmkeys/meson.build
+++ b/plugins/mmkeys/meson.build
@@ -12,8 +12,8 @@ shared_module('mmkeys',
   install_dir: mmkeys_plugin_dir)
 
 mmkeys_plugin_descriptor = custom_target('mmkeys-plugin-descriptor',
-  input: 'mmkeys.plugin.in',
+  input: 'mmkeys.desktop.plugin.in',
   output: 'mmkeys.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: mmkeys_plugin_dir)
diff --git a/plugins/mmkeys/mmkeys.plugin.in b/plugins/mmkeys/mmkeys.desktop.plugin.in
similarity index 68%
rename from plugins/mmkeys/mmkeys.plugin.in
rename to plugins/mmkeys/mmkeys.desktop.plugin.in
index 597254e94..78bbcb29a 100644
--- a/plugins/mmkeys/mmkeys.plugin.in
+++ b/plugins/mmkeys/mmkeys.desktop.plugin.in
@@ -2,8 +2,8 @@
 Module=mmkeys
 IAge=2
 Builtin=true
-_Name=Media Player Keys
-_Description=Control Rhythmbox using key shortcuts
+Name=Media Player Keys
+Description=Control Rhythmbox using key shortcuts
 Authors=Rhythmbox authors
 Copyright=Copyright © 2002-2007 Rhythmbox authors
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/mpris/meson.build b/plugins/mpris/meson.build
index 828164ce8..90ed39d91 100644
--- a/plugins/mpris/meson.build
+++ b/plugins/mpris/meson.build
@@ -20,8 +20,8 @@ shared_module('mpris',
   install_dir: mpris_plugin_dir)
 
 mpris_plugin_descriptor = custom_target('mpris-plugin-descriptor',
-  input: 'mpris.plugin.in',
+  input: 'mpris.desktop.plugin.in',
   output: 'mpris.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: mpris_plugin_dir)
diff --git a/plugins/mpris/mpris.plugin.in b/plugins/mpris/mpris.desktop.plugin.in
similarity index 60%
rename from plugins/mpris/mpris.plugin.in
rename to plugins/mpris/mpris.desktop.plugin.in
index de23d73bd..5059bf6e2 100644
--- a/plugins/mpris/mpris.plugin.in
+++ b/plugins/mpris/mpris.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=mpris
 IAge=2
-_Name=MPRIS D-Bus interface
-_Description=Provides an implementation of the MPRIS D-Bus interface specification
+Name=MPRIS D-Bus interface
+Description=Provides an implementation of the MPRIS D-Bus interface specification
 Authors=Jonathan Matthew
 Copyright=Copyright © 2010 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/mtpdevice/meson.build b/plugins/mtpdevice/meson.build
index b7a244aa2..9845189e3 100644
--- a/plugins/mtpdevice/meson.build
+++ b/plugins/mtpdevice/meson.build
@@ -29,8 +29,8 @@ shared_module('mtpdevice',
   install_dir: mtpdevice_plugin_dir)
 
 mtpdevice_plugin_descriptor = custom_target('mtpdevice-plugin-descriptor',
-  input: 'mtpdevice.plugin.in',
+  input: 'mtpdevice.desktop.plugin.in',
   output: 'mtpdevice.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: mtpdevice_plugin_dir)
diff --git a/plugins/mtpdevice/mtpdevice.plugin.in b/plugins/mtpdevice/mtpdevice.desktop.plugin.in
similarity index 61%
rename from plugins/mtpdevice/mtpdevice.plugin.in
rename to plugins/mtpdevice/mtpdevice.desktop.plugin.in
index 3ed54ae60..5659e99c7 100644
--- a/plugins/mtpdevice/mtpdevice.plugin.in
+++ b/plugins/mtpdevice/mtpdevice.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=mtpdevice
 IAge=2
-_Name=Portable Players - MTP
-_Description=Support for MTP devices (show the content, transfer, play from device)
+Name=Portable Players - MTP
+Description=Support for MTP devices (show the content, transfer, play from device)
 Authors=Peter Grundström
 Copyright=Copyright © 2006-2007 Peter Grundström
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/notification/meson.build b/plugins/notification/meson.build
index 391d363be..5ebad319a 100644
--- a/plugins/notification/meson.build
+++ b/plugins/notification/meson.build
@@ -12,8 +12,8 @@ shared_module('notification',
   install_dir: notification_plugin_dir)
 
 notification_plugin_descriptor = custom_target('notification-plugin-descriptor',
-  input: 'notification.plugin.in',
+  input: 'notification.desktop.plugin.in',
   output: 'notification.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: notification_plugin_dir)
diff --git a/plugins/notification/notification.plugin.in b/plugins/notification/notification.desktop.plugin.in
similarity index 77%
rename from plugins/notification/notification.plugin.in
rename to plugins/notification/notification.desktop.plugin.in
index 7dfa19047..304d31377 100644
--- a/plugins/notification/notification.plugin.in
+++ b/plugins/notification/notification.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=notification
 IAge=2
-_Name=Notification
-_Description=Notification popups
+Name=Notification
+Description=Notification popups
 Authors=Jonathan Matthew
 Copyright=Copyright © 2010 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/power-manager/meson.build b/plugins/power-manager/meson.build
index 81b19ab2f..209b2fef9 100644
--- a/plugins/power-manager/meson.build
+++ b/plugins/power-manager/meson.build
@@ -13,8 +13,8 @@ shared_module('power-manager',
   install_dir: power_manager_plugin_dir)
 
 power_manager_plugin_descriptor = custom_target('power-manager-plugin-descriptor',
-  input: 'power-manager.plugin.in',
+  input: 'power-manager.desktop.plugin.in',
   output: 'power-manager.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: power_manager_plugin_dir)
diff --git a/plugins/power-manager/power-manager.plugin.in 
b/plugins/power-manager/power-manager.desktop.plugin.in
similarity index 65%
rename from plugins/power-manager/power-manager.plugin.in
rename to plugins/power-manager/power-manager.desktop.plugin.in
index 3a1da0ce3..82382d081 100644
--- a/plugins/power-manager/power-manager.plugin.in
+++ b/plugins/power-manager/power-manager.desktop.plugin.in
@@ -2,8 +2,8 @@
 Module=power-manager
 IAge=2
 Builtin=true
-_Name=Power Manager
-_Description=Inhibit Power Manager from suspending the machine while playing
+Name=Power Manager
+Description=Inhibit Power Manager from suspending the machine while playing
 Authors=Jonathan Matthew <jonathan d14n org>
 Copyright=Copyright © 2006 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/pythonconsole/meson.build b/plugins/pythonconsole/meson.build
index 345faa774..740df31e1 100644
--- a/plugins/pythonconsole/meson.build
+++ b/plugins/pythonconsole/meson.build
@@ -7,8 +7,8 @@ install_data(pythonconsole_plugin_files,
   install_dir: pythonconsole_plugin_dir)
 
 pythonconsole_plugin_descriptor = custom_target('pythonconsole-plugin-descriptor',
-  input: 'pythonconsole.plugin.in',
+  input: 'pythonconsole.desktop.plugin.in',
   output: 'pythonconsole.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: pythonconsole_plugin_dir)
diff --git a/plugins/pythonconsole/pythonconsole.plugin.in 
b/plugins/pythonconsole/pythonconsole.desktop.plugin.in
similarity index 75%
rename from plugins/pythonconsole/pythonconsole.plugin.in
rename to plugins/pythonconsole/pythonconsole.desktop.plugin.in
index 35728bf42..92d030f84 100644
--- a/plugins/pythonconsole/pythonconsole.plugin.in
+++ b/plugins/pythonconsole/pythonconsole.desktop.plugin.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=pythonconsole
 IAge=2
-_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=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/rbzeitgeist/meson.build b/plugins/rbzeitgeist/meson.build
index 4c26e6273..ed1e832b7 100644
--- a/plugins/rbzeitgeist/meson.build
+++ b/plugins/rbzeitgeist/meson.build
@@ -7,8 +7,8 @@ install_data(rbzeitgeist_plugin_files,
   install_dir: rbzeitgeist_plugin_dir)
 
 rbzeitgeist_plugin_descriptor = custom_target('rbzeitgeist-plugin-descriptor',
-  input: 'rbzeitgeist.plugin.in',
+  input: 'rbzeitgeist.desktop.plugin.in',
   output: 'rbzeitgeist.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: rbzeitgeist_plugin_dir)
diff --git a/plugins/rbzeitgeist/rbzeitgeist.plugin.in b/plugins/rbzeitgeist/rbzeitgeist.desktop.plugin.in
similarity index 73%
rename from plugins/rbzeitgeist/rbzeitgeist.plugin.in
rename to plugins/rbzeitgeist/rbzeitgeist.desktop.plugin.in
index c4758da20..7b8965b59 100644
--- a/plugins/rbzeitgeist/rbzeitgeist.plugin.in
+++ b/plugins/rbzeitgeist/rbzeitgeist.desktop.plugin.in
@@ -3,8 +3,8 @@ Loader=python3
 Module=rbzeitgeist
 IAge=2
 Depends=rb
-_Name=Zeitgeist
-_Description=Inform Zeitgeist about your activity
+Name=Zeitgeist
+Description=Inform Zeitgeist about your activity
 Authors=Markus Korn <thekorn gmx de>
 Copyright=Copyright © 2009 Markus Korn
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/replaygain/meson.build b/plugins/replaygain/meson.build
index 38b92f917..7db1b68c9 100644
--- a/plugins/replaygain/meson.build
+++ b/plugins/replaygain/meson.build
@@ -10,9 +10,9 @@ install_data(replaygain_plugin_files,
   install_dir: replaygain_plugin_dir)
 
 replaygain_plugin_descriptor = custom_target('replaygain-plugin-descriptor',
-  input: 'replaygain.plugin.in',
+  input: 'replaygain.desktop.plugin.in',
   output: 'replaygain.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: replaygain_plugin_dir)
 
diff --git a/plugins/replaygain/replaygain.plugin.in b/plugins/replaygain/replaygain.desktop.plugin.in
similarity index 67%
rename from plugins/replaygain/replaygain.plugin.in
rename to plugins/replaygain/replaygain.desktop.plugin.in
index a197caa27..5dc3eb87f 100644
--- a/plugins/replaygain/replaygain.plugin.in
+++ b/plugins/replaygain/replaygain.desktop.plugin.in
@@ -3,8 +3,8 @@ Loader=python3
 Module=replaygain
 IAge=2
 Depends=rb
-_Name=ReplayGain
-_Description=Use ReplayGain to provide a consistent playback volume
+Name=ReplayGain
+Description=Use ReplayGain to provide a consistent playback volume
 Authors=Jonathan Matthew
 Copyright=Copyright © 2010 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/soundcloud/meson.build b/plugins/soundcloud/meson.build
index 1e6e8df1f..2213bf607 100644
--- a/plugins/soundcloud/meson.build
+++ b/plugins/soundcloud/meson.build
@@ -8,9 +8,9 @@ install_data(soundcloud_plugin_files,
   install_dir: soundcloud_plugin_dir)
 
 soundcloud_plugin_descriptor = custom_target('soundcloud-plugin-descriptor',
-  input: 'soundcloud.plugin.in',
+  input: 'soundcloud.desktop.plugin.in',
   output: 'soundcloud.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: soundcloud_plugin_dir)
 
diff --git a/plugins/soundcloud/soundcloud.plugin.in b/plugins/soundcloud/soundcloud.desktop.plugin.in
similarity index 71%
rename from plugins/soundcloud/soundcloud.plugin.in
rename to plugins/soundcloud/soundcloud.desktop.plugin.in
index 2e6c2a8db..53607487e 100644
--- a/plugins/soundcloud/soundcloud.plugin.in
+++ b/plugins/soundcloud/soundcloud.desktop.plugin.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=soundcloud
 IAge=2
-_Name=SoundCloud
-_Description=Browse and play sounds from SoundCloud®
+Name=SoundCloud
+Description=Browse and play sounds from SoundCloud®
 Authors=Jonathan Matthew
 Copyright=Copyright © 2014 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/plugins/webremote/meson.build b/plugins/webremote/meson.build
index 532b5bfc6..3e3ab7fb2 100644
--- a/plugins/webremote/meson.build
+++ b/plugins/webremote/meson.build
@@ -9,9 +9,9 @@ install_data(webremote_plugin_files,
   install_dir: webremote_plugin_dir)
 
 webremote_plugin_descriptor = custom_target('webremote-plugin-descriptor',
-  input: 'webremote.plugin.in',
+  input: 'webremote.desktop.plugin.in',
   output: 'webremote.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: webremote_plugin_dir)
 
diff --git a/plugins/webremote/webremote.plugin.in b/plugins/webremote/webremote.desktop.plugin.in
similarity index 72%
rename from plugins/webremote/webremote.plugin.in
rename to plugins/webremote/webremote.desktop.plugin.in
index fed1d575c..f9a3b8753 100644
--- a/plugins/webremote/webremote.plugin.in
+++ b/plugins/webremote/webremote.desktop.plugin.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=webremote
 IAge=2
-_Name=Web remote control
-_Description=Control Rhythmbox from a web browser
+Name=Web remote control
+Description=Control Rhythmbox from a web browser
 Authors=Jonathan Matthew <jonathan d14n org>
 Copyright=Copyright © 2016 Jonathan Matthew
 Website=https://wiki.gnome.org/Apps/Rhythmbox
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eb19a2e28..4e320cb50 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -45,23 +45,23 @@ lib/rb-file-helpers.c
 lib/rb-util.c
 metadata/rb-metadata-dbus-client.c
 metadata/rb-metadata-gst.c
-[type: gettext/ini]plugins/android/android.plugin.in
+plugins/android/android.desktop.plugin.in
 [type: gettext/glade]plugins/android/android-info.ui
 [type: gettext/glade]plugins/android/android-toolbar.ui
 plugins/android/rb-android-plugin.c
 plugins/android/rb-android-source.c
-[type: gettext/ini]plugins/artsearch/artsearch.plugin.in
+plugins/artsearch/artsearch.desktop.plugin.in
 plugins/artsearch/artsearch.py
 plugins/artsearch/lastfm.py
 plugins/artsearch/songinfo.py
 [type: gettext/glade]plugins/audiocd/album-info.ui
-[type: gettext/ini]plugins/audiocd/audiocd.plugin.in
+plugins/audiocd/audiocd.desktop.plugin.in
 [type: gettext/glade]plugins/audiocd/audiocd-toolbar.ui
 plugins/audiocd/rb-audiocd-info.c
 plugins/audiocd/rb-audiocd-plugin.c
 plugins/audiocd/rb-audiocd-source.c
 plugins/audiocd/rb-musicbrainz-lookup.c
-[type: gettext/ini]plugins/audioscrobbler/audioscrobbler.plugin.in
+plugins/audioscrobbler/audioscrobbler.desktop.plugin.in
 [type: gettext/glade]plugins/audioscrobbler/audioscrobbler-preferences.ui
 [type: gettext/glade]plugins/audioscrobbler/audioscrobbler-profile.ui
 plugins/audioscrobbler/rb-audioscrobbler.c
@@ -69,11 +69,11 @@ plugins/audioscrobbler/rb-audioscrobbler-entry.c
 plugins/audioscrobbler/rb-audioscrobbler-plugin.c
 plugins/audioscrobbler/rb-audioscrobbler-profile-page.c
 plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
-[type: gettext/ini]plugins/brasero-disc-recorder/cd-recorder.plugin.in
+plugins/brasero-disc-recorder/cd-recorder.desktop.plugin.in
 plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
 plugins/context/AlbumTab.py
 plugins/context/ArtistTab.py
-[type: gettext/ini]plugins/context/context.plugin.in
+plugins/context/context.desktop.plugin.in
 plugins/context/ContextView.py
 plugins/context/LastFM.py
 plugins/context/LinksTab.py
@@ -82,7 +82,7 @@ plugins/context/tmpl/album-tmpl.html
 plugins/context/tmpl/artist-tmpl.html
 plugins/context/tmpl/loading.html
 plugins/context/tmpl/lyrics-tmpl.html
-[type: gettext/ini]plugins/daap/daap.plugin.in
+plugins/daap/daap.desktop.plugin.in
 [type: gettext/glade]plugins/daap/daap-prefs.ui
 [type: gettext/glade]plugins/daap/daap-toolbar.ui
 plugins/daap/rb-daap-plugin.c
@@ -90,78 +90,78 @@ plugins/daap/rb-daap-sharing.c
 plugins/daap/rb-daap-source.c
 plugins/daap/rb-dacp-pairing-page.c
 plugins/daap/rb-rhythmdb-dmap-db-adapter.c
-[type: gettext/ini]plugins/dbus-media-server/dbus-media-server.plugin.in
+plugins/dbus-media-server/dbus-media-server.desktop.plugin.in
 plugins/dbus-media-server/rb-dbus-media-server-plugin.c
-[type: gettext/ini]plugins/fmradio/fmradio.plugin.in
+plugins/fmradio/fmradio.desktop.plugin.in
 [type: gettext/glade]plugins/fmradio/fmradio-popup.ui
 [type: gettext/glade]plugins/fmradio/fmradio-toolbar.ui
 plugins/fmradio/rb-fm-radio-source.c
 [type: gettext/glade]plugins/generic-player/generic-player-info.ui
 [type: gettext/glade]plugins/generic-player/generic-player-toolbar.ui
-[type: gettext/ini]plugins/generic-player/generic-player.plugin.in
+plugins/generic-player/generic-player.desktop.plugin.in
 plugins/generic-player/rb-generic-player-plugin.c
 plugins/generic-player/rb-generic-player-source.c
 plugins/generic-player/rb-nokia770-source.c
 plugins/generic-player/rb-psp-source.c
-[type: gettext/ini]plugins/grilo/grilo.plugin.in
+plugins/grilo/grilo.desktop.plugin.in
 plugins/grilo/rb-grilo-plugin.c
 plugins/grilo/rb-grilo-source.c
-[type: gettext/ini]plugins/im-status/im-status.plugin.in
+plugins/im-status/im-status.desktop.plugin.in
 plugins/im-status/im-status.py
 [type: gettext/glade]plugins/ipod/ipod-info.ui
 [type: gettext/glade]plugins/ipod/ipod-init.ui
 [type: gettext/glade]plugins/ipod/ipod-toolbar.ui
-[type: gettext/ini]plugins/ipod/ipod.plugin.in
+plugins/ipod/ipod.desktop.plugin.in
 plugins/ipod/rb-ipod-helpers.c
 plugins/ipod/rb-ipod-plugin.c
 plugins/ipod/rb-ipod-source.c
-[type: gettext/ini]plugins/iradio/iradio.plugin.in
+plugins/iradio/iradio.desktop.plugin.in
 [type: gettext/glade]plugins/iradio/iradio-popup.ui
 [type: gettext/glade]plugins/iradio/iradio-toolbar.ui
 plugins/iradio/rb-iradio-source.c
 plugins/iradio/rb-station-properties-dialog.c
 [type: gettext/glade]plugins/iradio/station-properties.ui
 plugins/lirc/rb-lirc-plugin.c
-[type: gettext/ini]plugins/lirc/rblirc.plugin.in
-[type: gettext/ini]plugins/listenbrainz/listenbrainz.plugin.in
+plugins/lirc/rblirc.desktop.plugin.in
+plugins/listenbrainz/listenbrainz.desktop.plugin.in
 [type: gettext/glade]plugins/listenbrainz/settings.ui
 plugins/lyrics/LyricsConfigureDialog.py
-[type: gettext/ini]plugins/lyrics/lyrics.plugin.in
+plugins/lyrics/lyrics.desktop.plugin.in
 [type: gettext/glade]plugins/lyrics/lyrics-prefs.ui
 plugins/lyrics/lyrics.py
 plugins/lyrics/LyricsSites.py
 [type: gettext/glade]plugins/magnatune/magnatune-loading.ui
 [type: gettext/glade]plugins/magnatune/magnatune-popup.ui
 [type: gettext/glade]plugins/magnatune/magnatune-toolbar.ui
-[type: gettext/ini]plugins/magnatune/magnatune.plugin.in
+plugins/magnatune/magnatune.desktop.plugin.in
 [type: gettext/glade]plugins/magnatune/magnatune-prefs.ui
 plugins/magnatune/magnatune.py
 plugins/magnatune/MagnatuneSource.py
-[type: gettext/ini]plugins/mmkeys/mmkeys.plugin.in
-[type: gettext/ini]plugins/mpris/mpris.plugin.in
-[type: gettext/ini]plugins/mtpdevice/mtpdevice.plugin.in
+plugins/mmkeys/mmkeys.desktop.plugin.in
+plugins/mpris/mpris.desktop.plugin.in
+plugins/mtpdevice/mtpdevice.desktop.plugin.in
 [type: gettext/glade]plugins/mtpdevice/mtp-info.ui
 [type: gettext/glade]plugins/mtpdevice/mtp-toolbar.ui
 plugins/mtpdevice/rb-mtp-gst-src.c
 plugins/mtpdevice/rb-mtp-plugin.c
 plugins/mtpdevice/rb-mtp-source.c
 plugins/mtpdevice/rb-mtp-thread.c
-[type: gettext/ini]plugins/notification/notification.plugin.in
+plugins/notification/notification.desktop.plugin.in
 plugins/notification/rb-notification-plugin.c
-[type: gettext/ini]plugins/power-manager/power-manager.plugin.in
+plugins/power-manager/power-manager.desktop.plugin.in
 plugins/power-manager/rb-power-manager-plugin.c
-[type: gettext/ini]plugins/pythonconsole/pythonconsole.plugin.in
+plugins/pythonconsole/pythonconsole.desktop.plugin.in
 plugins/pythonconsole/pythonconsole.py
-[type: gettext/ini]plugins/rbzeitgeist/rbzeitgeist.plugin.in
+plugins/rbzeitgeist/rbzeitgeist.desktop.plugin.in
 plugins/replaygain/config.py
 plugins/replaygain/player.py
-[type: gettext/ini]plugins/replaygain/replaygain.plugin.in
+plugins/replaygain/replaygain.desktop.plugin.in
 [type: gettext/glade]plugins/replaygain/replaygain-prefs.ui
-[type: gettext/ini]plugins/soundcloud/soundcloud.plugin.in
+plugins/soundcloud/soundcloud.desktop.plugin.in
 plugins/soundcloud/soundcloud.py
 [type: gettext/glade]plugins/soundcloud/soundcloud.ui
 [type: gettext/glade]plugins/webremote/webremote-config.ui
-[type: gettext/ini]plugins/webremote/webremote.plugin.in
+plugins/webremote/webremote.desktop.plugin.in
 plugins/webremote/webremote.py
 podcast/rb-feed-podcast-properties-dialog.c
 podcast/rb-podcast-add-dialog.c
@@ -178,11 +178,11 @@ rhythmdb/rhythmdb-metadata-cache.c
 rhythmdb/rhythmdb-monitor.c
 rhythmdb/rhythmdb-property-model.c
 rhythmdb/rhythmdb-tree.c
-[type: gettext/ini]sample-plugins/sample-python/sample-python.plugin.in
+sample-plugins/sample-python/sample-python.desktop.plugin.in
 sample-plugins/sample-python/sample-python.py
 sample-plugins/sample/rb-sample-plugin.c
-[type: gettext/ini]sample-plugins/sample/sample.plugin.in
-[type: gettext/ini]sample-plugins/sample-vala/sample-vala.plugin.in
+sample-plugins/sample/sample.desktop.plugin.in
+sample-plugins/sample-vala/sample-vala.desktop.plugin.in
 shell/main.c
 shell/rb-application.c
 shell/rb-playlist-manager.c
diff --git a/sample-plugins/sample-python/meson.build b/sample-plugins/sample-python/meson.build
index a2aa954ce..4dbb37567 100644
--- a/sample-plugins/sample-python/meson.build
+++ b/sample-plugins/sample-python/meson.build
@@ -9,8 +9,8 @@ install_data(sample_python_plugin_files,
   install_dir: sample_python_plugin_dir)
 
 sample_python_plugin_descriptor = custom_target('sample-python-plugin-descriptor',
-  input: 'sample-python.plugin.in',
+  input: 'sample-python.desktop.plugin.in',
   output: 'sample-python.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: sample_python_plugin_dir)
diff --git a/sample-plugins/sample-python/sample-python.plugin.in 
b/sample-plugins/sample-python/sample-python.desktop.plugin.in
similarity index 68%
rename from sample-plugins/sample-python/sample-python.plugin.in
rename to sample-plugins/sample-python/sample-python.desktop.plugin.in
index 277c4e3b7..dedf6742a 100644
--- a/sample-plugins/sample-python/sample-python.plugin.in
+++ b/sample-plugins/sample-python/sample-python.desktop.plugin.in
@@ -2,8 +2,8 @@
 Loader=python3
 Module=sample-python
 IAge=2
-_Name=Python Sample Plugin
-_Description=A sample plugin in Python with no features
+Name=Python Sample Plugin
+Description=A sample plugin in Python with no features
 Authors=James Livingston <doclivingston gmail com>
 Copyright=Copyright © 2006 James Livingston
 Website=http://www.rhythmbox.org/
diff --git a/sample-plugins/sample-vala/meson.build b/sample-plugins/sample-vala/meson.build
index 1f54ec24d..d489e4873 100644
--- a/sample-plugins/sample-vala/meson.build
+++ b/sample-plugins/sample-vala/meson.build
@@ -22,8 +22,8 @@ shared_module('sample-vala',
   install: true)
 
 sample_vala_plugin_descriptor = custom_target('sample-vala-plugin-descriptor',
-  input: 'sample-vala.plugin.in',
+  input: 'sample-vala.desktop.plugin.in',
   output: 'sample-vala.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: sample_vala_plugin_dir)
diff --git a/sample-plugins/sample-vala/sample-vala.plugin.in 
b/sample-plugins/sample-vala/sample-vala.desktop.plugin.in
similarity index 67%
rename from sample-plugins/sample-vala/sample-vala.plugin.in
rename to sample-plugins/sample-vala/sample-vala.desktop.plugin.in
index f3c382bb8..306cc4a34 100644
--- a/sample-plugins/sample-vala/sample-vala.plugin.in
+++ b/sample-plugins/sample-vala/sample-vala.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=sample-vala
 IAge=2
-_Name=Vala Sample Plugin
-_Description=A sample plugin in Vala with no features
+Name=Vala Sample Plugin
+Description=A sample plugin in Vala with no features
 Authors=James Livingston <doclivingston gmail com>
 Copyright=Copyright © 2007 James Livingston
 Website=http://www.rhythmbox.org/
diff --git a/sample-plugins/sample/meson.build b/sample-plugins/sample/meson.build
index be8a65fc9..e09e6f8e1 100644
--- a/sample-plugins/sample/meson.build
+++ b/sample-plugins/sample/meson.build
@@ -12,8 +12,8 @@ shared_module('sample',
   install: true)
 
 sample_plugin_descriptor = custom_target('sample-plugin-descriptor',
-  input: 'sample.plugin.in',
+  input: 'sample.desktop.plugin.in',
   output: 'sample.plugin',
-  command: [intltool_merge, '--quiet', '--desktop-style', meson.source_root() + '/po', '@INPUT@', 
'@OUTPUT@'],
+  command: msgfmt_plugin_cmd,
   install: true,
   install_dir: sample_plugin_dir)
diff --git a/sample-plugins/sample/sample.plugin.in b/sample-plugins/sample/sample.desktop.plugin.in
similarity index 67%
rename from sample-plugins/sample/sample.plugin.in
rename to sample-plugins/sample/sample.desktop.plugin.in
index ddb0236db..98e057089 100644
--- a/sample-plugins/sample/sample.plugin.in
+++ b/sample-plugins/sample/sample.desktop.plugin.in
@@ -1,8 +1,8 @@
 [Plugin]
 Module=sample
 IAge=2
-_Name=Sample Plugin
-_Description=A sample plugin in C with no features
+Name=Sample Plugin
+Description=A sample plugin in C with no features
 Authors=Paolo Maggi <paolo gnome org>
 Copyright=Copyright © 2002-2005 Paolo Maggi
 Website=http://www.rhythmbox.org/
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]