From ab6556e393162fff0e0e0c80a9fff689b4e2ca05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 11 Nov 2017 18:47:31 +0100
Subject: New upstream version 3.26.2

---
 data/meson.build            | 27 +++++++++++++--------------
 data/simple-scan.desktop.in |  2 ++
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'data')

diff --git a/data/meson.build b/data/meson.build
index 8e5412f..cf7401b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -11,20 +11,19 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
 meson.add_install_script ('meson_compile_gschema.py')
 
-# Note the keywords explicitly listed to stop the icon field being translated
-# https://bugs.launchpad.net/bugs/1624662
-custom_target ('simple-scan.desktop',
-               output: 'simple-scan.desktop',
-               input: 'simple-scan.desktop.in',
-               command: [ msgfmt, '--desktop', '--keyword=Name', '--keyword=GenericName', '--keyword=Comment', '--keyword=Keywords', '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@' ],
-               install: true,
-               install_dir: join_paths (datadir, 'applications'))
+i18n.merge_file ('desktop-file',
+                 input: 'simple-scan.desktop.in',
+                 output: 'simple-scan.desktop',
+                 install: true,
+                 install_dir: join_paths (datadir, 'applications'),
+                 po_dir: '../po',
+                 type: 'desktop')
 
-custom_target ('simple-scan.appdata.xml',
-               output: 'simple-scan.appdata.xml',
-               input: 'simple-scan.appdata.xml.in',
-               command: [ msgfmt, '--xml', '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@' ],
-               install: true,
-               install_dir: join_paths (datadir, 'appdata'))
+i18n.merge_file ('appdata-file',
+                 input: 'simple-scan.appdata.xml.in',
+                 output: 'simple-scan.appdata.xml',
+                 install: true,
+                 install_dir: join_paths (datadir, 'appdata'),
+                 po_dir: '../po')
 
 install_man ('simple-scan.1')
diff --git a/data/simple-scan.desktop.in b/data/simple-scan.desktop.in
index 89edeb2..98deb0d 100644
--- a/data/simple-scan.desktop.in
+++ b/data/simple-scan.desktop.in
@@ -2,8 +2,10 @@
 Name=Simple Scan
 GenericName=Document Scanner
 Comment=Scan Documents
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=scan;scanner;flatbed;adf;
 Exec=simple-scan
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=scanner
 Terminal=false
 Type=Application
-- 
cgit v1.2.3