build: Migrate from Intltool to Gettext

Recent versions of Gettext are able to translate several formats
that are used in GNOME applications. This patch migrates from
Intltool to Gettext by using meson's i18n features.

The empty Icon= lines have been removed because they are unused,
and gettext can't handle empty values properly.

https://bugzilla.gnome.org/show_bug.cgi?id=787857

6 files changed, 20 insertions, 18 deletions

diff --git a/data/gnome-custom-session.desktop.in b/data/gnome-custom-session.desktop.in
index ae369527..bd9a077b 100644
--- a/data/gnome-custom-session.desktop.in
+++ b/data/gnome-custom-session.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Custom
-_Comment=This entry lets you select a saved session
+Name=Custom
+Comment=This entry lets you select a saved session
 Exec=gnome-session-custom-session
 TryExec=gnome-session-custom-session
diff --git a/data/gnome-dummy.session.desktop.in.in b/data/gnome-dummy.session.desktop.in.in
index f5a6d80f..10523464 100644
--- a/data/gnome-dummy.session.desktop.in.in
+++ b/data/gnome-dummy.session.desktop.in.in
@@ -1,2 +1,2 @@
 [GNOME Session]
-_Name=GNOME dummy
+Name=GNOME dummy
diff --git a/data/gnome-xorg.desktop.in b/data/gnome-xorg.desktop.in
index d00b3dcd..8ddeb851 100644
--- a/data/gnome-xorg.desktop.in
+++ b/data/gnome-xorg.desktop.in
@@ -1,8 +1,7 @@
 [Desktop Entry]
-_Name=GNOME on Xorg
-_Comment=This session logs you into GNOME
+Name=GNOME on Xorg
+Comment=This session logs you into GNOME
 Exec=gnome-session
 TryExec=gnome-session
-Icon=
 Type=Application
 DesktopNames=GNOME
diff --git a/data/gnome.desktop.in b/data/gnome.desktop.in
index b54b99cc..7b78e940 100644
--- a/data/gnome.desktop.in
+++ b/data/gnome.desktop.in
@@ -1,8 +1,7 @@
 [Desktop Entry]
-_Name=GNOME
-_Comment=This session logs you into GNOME
+Name=GNOME
+Comment=This session logs you into GNOME
 Exec=gnome-session
 TryExec=gnome-session
-Icon=
 Type=Application
 DesktopNames=GNOME
diff --git a/data/gnome.session.desktop.in.in b/data/gnome.session.desktop.in.in
index f25cd257..9c59034a 100644
--- a/data/gnome.session.desktop.in.in
+++ b/data/gnome.session.desktop.in.in
@@ -1,3 +1,3 @@
 [GNOME Session]
-_Name=GNOME
+Name=GNOME
 RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
diff --git a/data/meson.build b/data/meson.build
index bf7ecfa4..89af98f8 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -3,11 +3,12 @@ desktop = 'gnome.desktop'
 # FIXME: The same target can not be copied into two directories.
 #        There is a workaround in meson_post_install.py until proper solution arises:
 #        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
-custom_target(
+i18n.merge_file(
   desktop,
+  type: 'desktop',
   input: desktop + '.in',
   output: desktop,
-  command: intltool_desktop_cmd,
+  po_dir: po_dir,
   install: true,
   #install_dir: [
   #  join_paths(session_datadir, 'xsessions'),
@@ -18,11 +19,12 @@ custom_target(
 
 desktop = 'gnome-xorg.desktop'
 
-custom_target(
+i18n.merge_file(
   desktop,
+  type: 'desktop',
   input: desktop + '.in',
   output: desktop,
-  command: intltool_desktop_cmd,
+  po_dir: po_dir,
   install: true,
   install_dir: join_paths(session_datadir, 'xsessions')
 )
@@ -44,11 +46,12 @@ foreach session: sessions
     configuration: desktop_conf
   )
 
-  custom_target(
+  i18n.merge_file(
     session,
+    type: 'desktop',
     input: desktop_in,
     output: session,
-    command: intltool_desktop_cmd,
+    po_dir: po_dir,
     install: true,
     install_dir: join_paths(session_pkgdatadir, 'sessions')
   )
@@ -78,11 +81,12 @@ if enable_session_selector
 
   desktop = 'gnome-custom-session.desktop'
 
-  custom_target(
+  i18n.merge_file(
     desktop,
+    type: 'desktop',
     input: desktop + '.in',
     output: desktop,
-    command: intltool_desktop_cmd,
+    po_dir: po_dir,
     install: true,
     install_dir: join_paths(session_datadir, 'xsessions')
   )