Commit efe4de9a authored by Giovanni Campagna's avatar Giovanni Campagna

Fix translations of GSettings and appdata at the same time

Use intltool native support for GSettings to translate it,
which removes the need for INTLTOOL_XML_NOMERGE_RULE and allows
us to use INTLTOOL_XML_RULE for appdata.
parent cc40b096
......@@ -163,7 +163,7 @@ dnl ================================================================
dnl Gettext stuff.
dnl ================================================================
IT_PROG_INTLTOOL([0.40.0])
IT_PROG_INTLTOOL([0.50.1])
AM_GNU_GETTEXT_VERSION([0.18])
AM_GNU_GETTEXT([external])
......@@ -439,7 +439,7 @@ AC_CONFIG_FILES([
Makefile
data/gedit.desktop.in
data/gedit.pc
data/org.gnome.gedit.gschema.xml.in
data/org.gnome.gedit.gschema.xml
data/Makefile
docs/Makefile
docs/reference/Makefile
......
......@@ -3,7 +3,8 @@ desktop_in_files = gedit.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_XML_NOMERGE_RULE@
@INTLTOOL_XML_RULE@
appdatadir = $(datadir)/appdata
dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = gedit.appdata.xml.in
......@@ -27,8 +28,6 @@ gsettings_ENUM_NAMESPACE = org.gnome.gedit
gsettings_ENUM_FILES = $(top_srcdir)/gedit/*.h
gsettings_SCHEMAS = org.gnome.gedit.gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
if OS_OSX
......@@ -45,11 +44,11 @@ endif
EXTRA_DIST = \
$(desktop_in_files) \
gedit.appdata.xml \
gedit.appdata.xml.in \
$(service_in_files) \
$(man_MANS) \
gedit.pc.in \
org.gnome.gedit.gschema.xml.in.in \
org.gnome.gedit.gschema.xml.in \
gedit.convert \
osx.accels \
osx.css \
......
......@@ -3,7 +3,7 @@
[encoding: UTF-8]
data/gedit.appdata.xml.in
data/gedit.desktop.in.in
data/org.gnome.gedit.gschema.xml.in.in
[type: gettext/gsettings]data/org.gnome.gedit.gschema.xml.in
gedit/gedit-app.c
gedit/gedit-app-osx.c
gedit/gedit.c
......
data/gedit.desktop.in
data/org.gnome.gedit.gschema.xml.in
gedit/gedit-document-output-stream.c
gedit/dialogs/gedit-style-scheme-dialog.c
gedit/dialogs/gedit-style-scheme-dialog.ui
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment