From 65473b2912bb696d7b7da9d0943aef6c6e26254f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 1 Apr 2015 19:50:18 -0400 Subject: Fix schema translations There are two fixes here. First, we need to use the correct gettext domain in the schema file and second, we must not merge translations back into the xml file, since dconf-editor can't deal with that. http://bugzilla.gnome.org/show_bug.cgi?id=747125 --- src/Makefile.am | 3 +++ src/org.gnome.gnome-screenshot.gschema.xml.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 43731b0..f3b7fff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,6 +66,9 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml) appdata_in_files = org.gnome.Screenshot.appdata.xml.in @INTLTOOL_XML_RULE@ +%.gschema.xml: %.gschema.xml.in + $(AM_V_GEN) $(INTLTOOL_MERGE) -x -u --no-translations $< $@ + dbusservicedir = $(datadir)/dbus-1/services dbusservice_DATA = org.gnome.Screenshot.service diff --git a/src/org.gnome.gnome-screenshot.gschema.xml.in b/src/org.gnome.gnome-screenshot.gschema.xml.in index ea8a09a..8d08edf 100644 --- a/src/org.gnome.gnome-screenshot.gschema.xml.in +++ b/src/org.gnome.gnome-screenshot.gschema.xml.in @@ -1,4 +1,4 @@ - + -- cgit v1.2.1