[tracker-miners/wip/piotrdrag/kill-intltool: 11/11] Remove intltool also from the D-Bus service files

[Piotr Drąg <piotrdrag src gnome org>]

commit e3a6323c9581ed54d304bb80d6a05369a7c0de45
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Fri Sep 28 19:00:23 2018 +0200

    Remove intltool also from the D-Bus service files

 meson.build                                                         | 1 +
 po/POTFILES.in                                                      | 4 ++--
 po/POTFILES.skip                                                    | 6 +++---
 po/meson.build                                                      | 6 +++++-
 src/miners/fs/meson.build                                           | 6 +++---
 ...n => org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in} | 4 ++--
 src/miners/rss/meson.build                                          | 6 +++---
 ....in => org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in} | 4 ++--
 src/tracker-extract/meson.build                                     | 6 +++---
 ...=> org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in} | 4 ++--
 10 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/meson.build b/meson.build
index 1097367df..57941f724 100644
--- a/meson.build
+++ b/meson.build
@@ -398,6 +398,7 @@ po_dir = join_paths(meson.current_source_dir(), 'po')
 xdg_autostart_dir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
 
 glib_mkenums = find_program('glib-mkenums')
+msgfmt = find_program('msgfmt')
 
 subdir('src')
 subdir('data')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9497a963e..fc6420729 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,11 +9,11 @@ src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
 src/miners/fs/tracker-main.c
 src/miners/fs/tracker-miner-files.c
 src/miners/fs/tracker-miner-fs.desktop.in.in
-src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
+src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
 src/miners/rss/tracker-main.c
 src/miners/rss/tracker-miner-rss.c
 src/miners/rss/tracker-miner-rss.desktop.in.in
-src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
 src/tracker-extract/tracker-extract.c
 src/tracker-extract/tracker-main.c
 src/tracker-extract/tracker-extract.desktop.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 933b057c7..30662e452 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,8 +1,8 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
-src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
+src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in
 src/miners/fs/tracker-miner-fs.desktop.in
-src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
+src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in
 src/miners/rss/tracker-miner-rss.desktop.in
-src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
+src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in
 src/tracker-extract/tracker-extract.desktop.in
diff --git a/po/meson.build b/po/meson.build
index 9fec2bcf0..2e0ac5a0f 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1,5 @@
-i18n.gettext('tracker-miners', preset: 'glib')
+i18n.gettext(
+  'tracker-miners',
+  preset: 'glib',
+  args: '--keyword=DisplayName',
+)
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 7ed661739..4965934ef 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -35,14 +35,14 @@ executable('tracker-miner-fs', sources,
 )
 
 dbus_service_file_untranslated = configure_file(
-    input: 'org.freedesktop.Tracker1.Miner.Files.service.in.in',
-    output: 'org.freedesktop.Tracker1.Miner.Files.service.in',
+    input: 'org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in',
+    output: 'org.freedesktop.Tracker1.Miner.Files.service.desktop.in',
     configuration: conf)
 
 dbus_service_file = custom_target('tracker-miner-files-dbus-service-file',
     input: dbus_service_file_untranslated,
     output: 'org.freedesktop.Tracker1.Miner.Files.service',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    command: [msgfmt, '--desktop', '--keyword=DisplayName', '--template', '@INPUT@', '-d', po_dir, '-o', 
'@OUTPUT@'],
     install: true,
     install_dir: dbus_services_dir)
 
diff --git a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in 
b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
similarity index 81%
rename from src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
rename to src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
index a61719947..b58c0b8b2 100644
--- a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
+++ b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-fs.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker1/Miner/Files
 NameSuffix=Miner.Files
-_DisplayName=File System
-_Comment=File system data miner
+DisplayName=File System
+Comment=File system data miner
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index 037d74a9f..ac1e01ef6 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -12,14 +12,14 @@ executable('tracker-miner-rss', sources,
 )
 
 dbus_service_file_untranslated = configure_file(
-    input: 'org.freedesktop.Tracker1.Miner.RSS.service.in.in',
-    output: 'org.freedesktop.Tracker1.Miner.RSS.service.in',
+    input: 'org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in',
+    output: 'org.freedesktop.Tracker1.Miner.RSS.service.desktop.in',
     configuration: conf)
 
 dbus_service_file = custom_target('tracker-miner-rss-dbus-service-file',
     input: dbus_service_file_untranslated,
     output: 'org.freedesktop.Tracker1.Miner.RSS.service',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    command: [msgfmt, '--desktop', '--keyword=DisplayName', '--template', '@INPUT@', '-d', po_dir, '-o', 
'@OUTPUT@'],
     install: true,
     install_dir: dbus_services_dir)
 
diff --git a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in 
b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
similarity index 80%
rename from src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
rename to src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
index 372c21965..5da6d455e 100644
--- a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
+++ b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-rss.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker1/Miner/RSS
 NameSuffix=Miner.RSS
-_DisplayName=RSS/ATOM Feeds
-_Comment=Fetch RSS/ATOM Feeds
+DisplayName=RSS/ATOM Feeds
+Comment=Fetch RSS/ATOM Feeds
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index 1ecb4b22d..cbe3796d7 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -175,14 +175,14 @@ executable('tracker-extract',
   install_rpath: tracker_internal_libs_dir)
 
 dbus_service_file_untranslated = configure_file(
-  input: 'org.freedesktop.Tracker1.Miner.Extract.service.in.in',
-  output: 'org.freedesktop.Tracker1.Miner.Extract.service.in',
+  input: 'org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in',
+  output: 'org.freedesktop.Tracker1.Miner.Extract.service.desktop.in',
   configuration: conf)
 
 dbus_service_file = custom_target('tracker-extract-dbus-service-file',
   input: dbus_service_file_untranslated,
   output: 'org.freedesktop.Tracker1.Miner.Extract.service',
-  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), 
'@INPUT@', '@OUTPUT@'],
+  command: [msgfmt, '--desktop', '--keyword=DisplayName', '--template', '@INPUT@', '-d', po_dir, '-o', 
'@OUTPUT@'],
   install: true,
   install_dir: dbus_services_dir)
 
diff --git a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in 
b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
similarity index 82%
rename from src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
rename to src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
index 32dd1dfd0..17b294bfc 100644
--- a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+++ b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-extract.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker1/Miner/Extract
 NameSuffix=Miner.Extract
-_DisplayName=Extractor
-_Comment=Metadata extractor
+DisplayName=Extractor
+Comment=Metadata extractor