From 143fc164f11f08509a1d22943aec5b691612e81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Sep 2016 21:13:20 +0200 Subject: New upstream version 3.22.0.1 --- data/Makefile.am | 4 +++- data/Makefile.in | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'data') 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@ -- cgit v1.2.3