summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-09-21 21:13:38 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-09-21 21:13:38 +0200
commitb06c193326c76e443e70d604ca818310d84a8530 (patch)
tree341bc74c1900570f9d48bb4aefc83932c17bdf0a /data
parent7b035042ca7a0ad30cc6ee91a9e15d4a38384287 (diff)
parent143fc164f11f08509a1d22943aec5b691612e81a (diff)
Merge tag 'upstream/3.22.0.1'
Upstream version 3.22.0.1
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am4
-rw-r--r--data/Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 5f421a0..7d29429 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,8 +4,10 @@ desktopdir = $(datadir)/applications
desktop_in_files = simple-scan.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+# Explicitly list the keywords to stop the icon field being translated
+# https://bugs.launchpad.net/bugs/1624662
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
@GSETTINGS_RULES@
diff --git a/data/Makefile.in b/data/Makefile.in
index d9bc6f4..d310329 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -749,8 +749,10 @@ uninstall-man: uninstall-man1
.PRECIOUS: Makefile
+# Explicitly list the keywords to stop the icon field being translated
+# https://bugs.launchpad.net/bugs/1624662
$(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
@GSETTINGS_RULES@
@APPSTREAM_XML_RULES@