[gimp/meson: 105/128] Fix translations in xml files.

[Félix Piédallu <fpiedallu src gnome org>]

commit 3d42210bc33245a18684c80fdb85ae367586082d
Author: Félix Piédallu <felix piedallu me>
Date:   Thu Jan 11 13:39:19 2018 +0100

    Fix translations in xml files.

 data/tags/meson.build |    6 +++---
 data/tips/meson.build |    6 +++---
 desktop/meson.build   |   21 +++++++++------------
 meson_todo.md         |    1 -
 4 files changed, 15 insertions(+), 19 deletions(-)
---
diff --git a/data/tags/meson.build b/data/tags/meson.build
index 4e2b149..4d6c627 100644
--- a/data/tags/meson.build
+++ b/data/tags/meson.build
@@ -7,12 +7,12 @@ gimp_tags_default = custom_target(xmlfilename,
 
   command: [
     intltool_merge,
-    '--xml-style',
-    '--utf8',
-    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
     potags_dir,
     '@INPUT@',
     '@OUTPUT@',
+    '--xml-style',
+    '--utf8',
+    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
   ],
   install: true,
   install_dir: join_paths(gimpdatadir, 'tags'),
diff --git a/data/tips/meson.build b/data/tips/meson.build
index 9544d38..1bf6b07 100644
--- a/data/tips/meson.build
+++ b/data/tips/meson.build
@@ -7,12 +7,12 @@ gimp_tips = custom_target(xmlfilename,
 
   command: [
     intltool_merge,
-    '--xml-style',
-    '--utf8',
-    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
     potips_dir,
     '@INPUT@',
     '@OUTPUT@',
+    '--xml-style',
+    '--utf8',
+    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
   ],
   install: true,
   install_dir: join_paths(gimpdatadir, 'tips'),
diff --git a/desktop/meson.build b/desktop/meson.build
index 1c2800f..b4273c6 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -34,15 +34,14 @@ desktopfilein = configure_file(
 desktopfile = custom_target(desktopfilename,
   input : [ desktopfilein, ],
   output: [ desktopfilename, ],
-
   command: [
     intltool_merge,
-    '--desktop-style',
-    '--utf8',
-    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
     po_dir,
     '@INPUT@',
     '@OUTPUT@',
+    '--desktop-style',
+    '--utf8',
+    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
   ],
   install: true,
   install_dir: join_paths(get_option('datadir'), 'applications'),
@@ -52,15 +51,14 @@ appdatafilename = 'gimp.appdata.xml'
 appdatafile = custom_target(appdatafilename,
   input : [ appdatafilename+'.in', ],
   output: [ appdatafilename, ],
-
   command: [
     intltool_merge,
-    '--desktop-style',
-    '--utf8',
-    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
     po_dir,
     '@INPUT@',
     '@OUTPUT@',
+    '--xml-style',
+    '--utf8',
+    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
   ],
   install: true,
   install_dir: join_paths(get_option('datadir'), 'appdata'),
@@ -70,15 +68,14 @@ appdatafilename = 'gimp-data-extras.metainfo.xml'
 appdatafile = custom_target(appdatafilename,
   input : [ appdatafilename+'.in', ],
   output: [ appdatafilename, ],
-
   command: [
     intltool_merge,
-    '--desktop-style',
-    '--utf8',
-    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
     po_dir,
     '@INPUT@',
     '@OUTPUT@',
+    '--xml-style',
+    '--utf8',
+    '--cache='+join_paths('@OUTDIR@', 'intltool-merge-cache'),
   ],
   install: true,
   install_dir: join_paths(get_option('datadir'), 'appdata'),
diff --git a/meson_todo.md b/meson_todo.md
index fdde497..e882c8c 100644
--- a/meson_todo.md
+++ b/meson_todo.md
@@ -55,7 +55,6 @@ Meson Port
 ## Missing
 * icons/Symbolic-Inverted
 * tools/pdbgen
-* translations in `appdata/*.xml`, `tips/gimp-tips.xml`
 * gtkrc : missing python-fu-console ??
 * man : XDG_CONFIG_HOME are replaced with /usr ??