From 0a8b47229c6b453556a40b30c84db8f238e3b887 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Tue, 9 Oct 2012 21:01:21 +0200 Subject: add internationalization support for gsettings schema --- libmatekbd/Makefile.am | 16 +-- .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 --------------------- ...mate.peripherals-keyboard-xkb.gschema.xml.in.in | 119 +++++++++++++++++++++ 3 files changed, 128 insertions(+), 126 deletions(-) delete mode 100644 libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml create mode 100644 libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in diff --git a/libmatekbd/Makefile.am b/libmatekbd/Makefile.am index b27a6d4..1a5932a 100644 --- a/libmatekbd/Makefile.am +++ b/libmatekbd/Makefile.am @@ -57,7 +57,7 @@ BUILT_SOURCES = matekbd-indicator-marshal.c \ matekbd-keyboard-drawing-marshal.c \ matekbd-keyboard-drawing-marshal.h -CLEANFILES = $(BUILT_SOURCES) $(schema_DATA) +CLEANFILES = $(BUILT_SOURCES) matekbdincdir = $(includedir)/libmatekbd matekbdinc_HEADERS = \ @@ -71,14 +71,19 @@ matekbdinc_HEADERS = \ @INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_SCHEMAS_RULE@ - noinst_HEADERS = $(extra_nih) \ matekbd-config-private.h +@INTLTOOL_XML_NOMERGE_RULE@ +gsettings_SCHEMAS = org.mate.peripherals-keyboard-xkb.gschema.xml +@GSETTINGS_RULES@ + +%.gschema.xml.in: %.gschema.xml.in.in Makefile + $(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ + EXTRA_DIST = matekbd-indicator-marshal.list \ matekbd-keyboard-drawing-marshal.list \ - $(schema_in_files) $(ui_DATA) + $(gsettings_SCHEMAS) $(ui_DATA) GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0) @@ -99,6 +104,3 @@ matekbd-keyboard-drawing-marshal.c: matekbd-keyboard-drawing-marshal.h --body > matekbd-keyboard-drawing-marshal.tmp \ && mv matekbd-keyboard-drawing-marshal.tmp matekbd-keyboard-drawing-marshal.c ) \ || ( rm -f matekbd-keyboard-drawing-marshal.tmp && exit 1 ) - -gsettings_SCHEMAS = org.mate.peripherals-keyboard-xkb.gschema.xml -@GSETTINGS_RULES@ diff --git a/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml b/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml deleted file mode 100644 index 7d89db2..0000000 --- a/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - '' - Keyboard model - keyboard model - - - [] - Keyboard layout - keyboard layout - - - [] - Keyboard options - Keyboard options - - - - - [] - Keyboard Update Handlers - A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments - - - [] - modmap file list - A list of modmap files available in the $HOME directory. - - - -1 - Default group, assigned on window creation - Default group, assigned on window creation - - - true - Keep and manage separate group per window - Keep and manage separate group per window - - - false - Save/restore indicators together with layout groups - Save/restore indicators together with layout groups - - - true - Show layout names instead of group names - Show layout names instead of group names (only for versions of XFree supporting multiple layouts) - - - false - Load extra configuration items - Load exotic, rarely used layouts and options - - - false - Suppress the "X sysconfig changed" warning message - Suppress the "X sysconfig changed" warning message - - - - - -1 - The Keyboard Preview, X offset - The Keyboard Preview, X offset - - - -1 - The Keyboard Preview, Y offset - The Keyboard Preview, Y offset - - - -1 - The Keyboard Preview, width - The Keyboard Preview, width - - - -1 - The Keyboard Preview, height - The Keyboard Preview, height - - - - - 0 - Secondary groups - Secondary groups - - - false - - - '' - The font family - The font family for the layout indicator - - - 10 - The font size - The font size for the layout indicator - - - '' - The foreground color - The foreground color for the layout indicator - - - '' - The background color - The background color for the layout indicator - - - diff --git a/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in b/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in new file mode 100644 index 0000000..09edc91 --- /dev/null +++ b/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in @@ -0,0 +1,119 @@ + + + + + + + + + + '' + <_summary>Keyboard model + <_description>keyboard model + + + [] + <_summary>Keyboard layout + <_description>keyboard layout + + + [] + <_summary>Keyboard options + <_description>Keyboard options + + + + + [] + <_summary>Keyboard Update Handlers + <_description>A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments + + + [] + <_summary>modmap file list + <_description>A list of modmap files available in the $HOME directory. + + + -1 + <_summary>Default group, assigned on window creation + <_description>Default group, assigned on window creation + + + true + <_summary>Keep and manage separate group per window + <_description>Keep and manage separate group per window + + + false + <_summary>Save/restore indicators together with layout groups + <_description>Save/restore indicators together with layout groups + + + true + <_summary>Show layout names instead of group names + <_description>Show layout names instead of group names (only for versions of XFree supporting multiple layouts) + + + false + <_summary>Load extra configuration items + <_description>Load exotic, rarely used layouts and options + + + false + <_summary>Suppress the "X sysconfig changed" warning message + <_description>Suppress the "X sysconfig changed" warning message + + + + + -1 + <_summary>The Keyboard Preview, X offset + <_description>The Keyboard Preview, X offset + + + -1 + <_summary>The Keyboard Preview, Y offset + <_description>The Keyboard Preview, Y offset + + + -1 + <_summary>The Keyboard Preview, width + <_description>The Keyboard Preview, width + + + -1 + <_summary>The Keyboard Preview, height + <_description>The Keyboard Preview, height + + + + + 0 + <_summary>Secondary groups + <_description>Secondary groups + + + false + + + '' + <_summary>The font family + <_description>The font family for the layout indicator + + + 10 + <_summary>The font size + <_description>The font size for the layout indicator + + + '' + <_summary>The foreground color + <_description>The foreground color for the layout indicator + + + '' + <_summary>The background color + <_description>The background color for the layout indicator + + + -- cgit v1.2.1