Fix the i18n of gsettings

11 files changed, 172 insertions, 34 deletions

diff --git a/configure.in b/configure.in
index b3491cb..719d81a 100644
--- a/configure.in
+++ b/configure.in
@@ -33,6 +33,7 @@ GNOME_COMPILE_WARNINGS
 
 AC_ISC_POSIX
 AC_PROG_CC
+AC_PROG_CC_C_O
 AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 
@@ -90,6 +91,9 @@ libgnomekbd.pc
 libgnomekbdui.pc
 po/Makefile.in
 libgnomekbd/Makefile
+libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
 test/Makefile
 capplet/Makefile
 capplet/gkbd-indicator-plugins-capplet.desktop.in
diff --git a/libgnomekbd/.gitignore b/libgnomekbd/.gitignore
index 2841c46..11c6889 100644
--- a/libgnomekbd/.gitignore
+++ b/libgnomekbd/.gitignore
@@ -9,3 +9,6 @@ Makefile.in
 *marshal.c
 *marshal.h
 *.o
+org.gnome.libgnomekbd.*gschema.xml
+org.gnome.libgnomekbd.*gschema.xml.in
+
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 509d6f2..1f7933d 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -8,6 +8,8 @@ gsettings_SCHEMAS = org.gnome.libgnomekbd.desktop.gschema.xml \
 		    org.gnome.libgnomekbd.gschema.xml
 @GSETTINGS_RULES@
 
+@INTLTOOL_XML_NOMERGE_RULE@
+
 common_CFLAGS = \
 	-I$(top_srcdir) -Wall 			\
 	$(GDK_CFLAGS)					\
@@ -60,7 +62,12 @@ BUILT_SOURCES = gkbd-indicator-marshal.c \
         gkbd-keyboard-drawing-marshal.c            \
         gkbd-keyboard-drawing-marshal.h
 
-CLEANFILES = $(BUILT_SOURCES) $(schema_DATA)
+DISTCLEANFILES = $(BUILT_SOURCES) $(gsettings_SCHEMAS)
+
+MAINTAINERCLEANFILES =                  \
+        *~                              \
+        Makefile.in                     \
+        $(gsettings_SCHEMAS:.xml=.valid)
 
 gnomekbdincdir = $(includedir)/libgnomekbd
 gnomekbdinc_HEADERS = \
@@ -81,7 +88,9 @@ noinst_HEADERS = gkbd-indicator-plugin-manager.h \
 
 EXTRA_DIST = gkbd-indicator-marshal.list \
              gkbd-keyboard-drawing-marshal.list \
-             $(ui_DATA) $(gsettings_SCHEMAS)
+             $(ui_DATA) \
+             $(gsettings_SCHEMAS:.xml=.xml.in.in) 
+
 
 GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
 
diff --git a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml
index 54fc055..078445d 100644
--- a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml
+++ b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema id="org.gnome.libgnomekbd.desktop" path="/desktop/gnome/peripherals/keyboard/general/">
-    <key name="default-group" type="i">
+  <schema path="/desktop/gnome/peripherals/keyboard/general/" id="org.gnome.libgnomekbd.desktop" gettext-domain="libgnomekbd">
+    <key type="i" name="default-group">
       <default>-1</default>
       <summary>Default group, assigned on window creation</summary>
       <description>Default group, assigned on window creation</description>
     </key>
-    <key name="group-per-window" type="b">
+    <key type="b" name="group-per-window">
       <default>true</default>
       <summary>Keep and manage separate group per window</summary>
       <description>Keep and manage separate group per window</description>
     </key>
-    <key name="handle-indicators" type="b">
+    <key type="b" name="handle-indicators">
       <default>false</default>
       <summary>Save/restore indicators together with layout groups</summary>
       <description>Save/restore indicators together with layout groups</description>
     </key>
-    <key name="layout-names-as-group-names" type="b">
+    <key type="b" name="layout-names-as-group-names">
       <default>true</default>
       <summary>Show layout names instead of group names</summary>
       <description>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</description>
     </key>
-    <key name="load-extra-items" type="b">
+    <key type="b" name="load-extra-items">
       <default>false</default>
       <summary>Load extra configuration items</summary>
       <description>Load exotic, rarely used layouts and options</description>
     </key>
   </schema>
-</schemalist>
+</schemalist>
\ No newline at end of file
diff --git a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
new file mode 100644
index 0000000..7be778d
--- /dev/null
+++ b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.desktop" path="/desktop/gnome/peripherals/keyboard/general/">
+    <key name="default-group" type="i">
+      <default>-1</default>
+      <_summary>Default group, assigned on window creation</_summary>
+      <_description>Default group, assigned on window creation</_description>
+    </key>
+    <key name="group-per-window" type="b">
+      <default>true</default>
+      <_summary>Keep and manage separate group per window</_summary>
+      <_description>Keep and manage separate group per window</_description>
+    </key>
+    <key name="handle-indicators" type="b">
+      <default>false</default>
+      <_summary>Save/restore indicators together with layout groups</_summary>
+      <_description>Save/restore indicators together with layout groups</_description>
+    </key>
+    <key name="layout-names-as-group-names" type="b">
+      <default>true</default>
+      <_summary>Show layout names instead of group names</_summary>
+      <_description>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</_description>
+    </key>
+    <key name="load-extra-items" type="b">
+      <default>false</default>
+      <_summary>Load extra configuration items</_summary>
+      <_description>Load exotic, rarely used layouts and options</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/libgnomekbd/org.gnome.libgnomekbd.gschema.xml b/libgnomekbd/org.gnome.libgnomekbd.gschema.xml
index a2c9ace..eafdcc8 100644
--- a/libgnomekbd/org.gnome.libgnomekbd.gschema.xml
+++ b/libgnomekbd/org.gnome.libgnomekbd.gschema.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema id="org.gnome.libgnomekbd" path="/desktop/gnome/peripherals/keyboard/">
-    <child name="preview" schema="org.gnome.libgnomekbd.preview"/>
-    <child name="indicator" schema="org.gnome.libgnomekbd.indicator"/>
+  <schema path="/desktop/gnome/peripherals/keyboard/" id="org.gnome.libgnomekbd" gettext-domain="libgnomekbd">
+    <child schema="org.gnome.libgnomekbd.preview" name="preview"/>
+    <child schema="org.gnome.libgnomekbd.indicator" name="indicator"/>
   </schema>
-  <schema id="org.gnome.libgnomekbd.preview" path="/desktop/gnome/peripherals/keyboard/preview/">
-    <key name="x" type="i">
+  <schema path="/desktop/gnome/peripherals/keyboard/preview/" id="org.gnome.libgnomekbd.preview" gettext-domain="libgnomekbd">
+    <key type="i" name="x">
       <default>-1</default>
       <summary>The Keyboard Preview, X offset</summary>
       <description>The Keyboard Preview, X offset</description>
     </key>
-    <key name="y" type="i">
+    <key type="i" name="y">
       <default>-1</default>
       <summary>The Keyboard Preview, Y offset</summary>
       <description>The Keyboard Preview, Y offset</description>
     </key>
-    <key name="width" type="i">
+    <key type="i" name="width">
       <default>-1</default>
       <summary>The Keyboard Preview, width</summary>
       <description>The Keyboard Preview, width</description>
     </key>
-    <key name="height" type="i">
+    <key type="i" name="height">
       <default>-1</default>
       <summary>The Keyboard Preview, height</summary>
       <description>The Keyboard Preview, height</description>
     </key>
   </schema>
-  <schema id="org.gnome.libgnomekbd.indicator" path="/desktop/gnome/peripherals/keyboard/indicator/">
-    <key name="secondary" type="i">
+  <schema path="/desktop/gnome/peripherals/keyboard/indicator/" id="org.gnome.libgnomekbd.indicator" gettext-domain="libgnomekbd">
+    <key type="i" name="secondary">
       <default>0</default>
       <summary>Secondary groups</summary>
       <description>Secondary groups</description>
     </key>
-    <key name="show-flags" type="b">
+    <key type="b" name="show-flags">
       <default>false</default>
       <summary>Show flags in the applet</summary>
       <description>Show flags in the applet to indicate the current layout</description>
     </key>
-    <key name="font-family" type="s">
+    <key type="s" name="font-family">
       <default>''</default>
       <summary>The font family</summary>
       <description>The font family for the layout indicator</description>
     </key>
-    <key name="font-size" type="i">
+    <key type="i" name="font-size">
       <default>10</default>
       <summary>The font size</summary>
       <description>The font size for the layout indicator</description>
     </key>
-    <key name="foreground-color" type="s">
+    <key type="s" name="foreground-color">
       <default>''</default>
       <summary>The foreground color</summary>
       <description>The foreground color for the layout indicator</description>
     </key>
-    <key name="background-color" type="s">
+    <key type="s" name="background-color">
       <default>''</default>
       <summary>The background color</summary>
       <description>The background color for the layout indicator</description>
     </key>
-    <key name="enabled-plugins" type="as">
+    <key type="as" name="enabled-plugins">
       <default>[]</default>
       <summary>The list of enabled Keyboard Indicator plugins</summary>
       <description>The list of enabled Keyboard Indicator plugins</description>
     </key>
   </schema>
-</schemalist>
+</schemalist>
\ No newline at end of file
diff --git a/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in b/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
new file mode 100644
index 0000000..df7c81a
--- /dev/null
+++ b/libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd" path="/desktop/gnome/peripherals/keyboard/">
+    <child name="preview" schema="org.gnome.libgnomekbd.preview"/>
+    <child name="indicator" schema="org.gnome.libgnomekbd.indicator"/>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.preview" path="/desktop/gnome/peripherals/keyboard/preview/">
+    <key name="x" type="i">
+      <default>-1</default>
+      <_summary>The Keyboard Preview, X offset</_summary>
+      <_description>The Keyboard Preview, X offset</_description>
+    </key>
+    <key name="y" type="i">
+      <default>-1</default>
+      <_summary>The Keyboard Preview, Y offset</_summary>
+      <_description>The Keyboard Preview, Y offset</_description>
+    </key>
+    <key name="width" type="i">
+      <default>-1</default>
+      <_summary>The Keyboard Preview, width</_summary>
+      <_description>The Keyboard Preview, width</_description>
+    </key>
+    <key name="height" type="i">
+      <default>-1</default>
+      <_summary>The Keyboard Preview, height</_summary>
+      <_description>The Keyboard Preview, height</_description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.indicator" path="/desktop/gnome/peripherals/keyboard/indicator/">
+    <key name="secondary" type="i">
+      <default>0</default>
+      <_summary>Secondary groups</_summary>
+      <_description>Secondary groups</_description>
+    </key>
+    <key name="show-flags" type="b">
+      <default>false</default>
+      <_summary>Show flags in the applet</_summary>
+      <_description>Show flags in the applet to indicate the current layout</_description>
+    </key>
+    <key name="font-family" type="s">
+      <default>''</default>
+      <_summary>The font family</_summary>
+      <_description>The font family for the layout indicator</_description>
+    </key>
+    <key name="font-size" type="i">
+      <default>10</default>
+      <_summary>The font size</_summary>
+      <_description>The font size for the layout indicator</_description>
+    </key>
+    <key name="foreground-color" type="s">
+      <default>''</default>
+      <_summary>The foreground color</_summary>
+      <_description>The foreground color for the layout indicator</_description>
+    </key>
+    <key name="background-color" type="s">
+      <default>''</default>
+      <_summary>The background color</_summary>
+      <_description>The background color for the layout indicator</_description>
+    </key>
+    <key name="enabled-plugins" type="as">
+      <default>[]</default>
+      <_summary>The list of enabled Keyboard Indicator plugins</_summary>
+      <_description>The list of enabled Keyboard Indicator plugins</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml b/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml
index 902b8c0..658b073 100644
--- a/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml
+++ b/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema id="org.gnome.libgnomekbd.keyboard" path="/desktop/gnome/peripherals/keyboard/kbd/">
-    <key name="model" type="s">
+  <schema path="/desktop/gnome/peripherals/keyboard/kbd/" id="org.gnome.libgnomekbd.keyboard" gettext-domain="libgnomekbd">
+    <key type="s" name="model">
       <default>''</default>
       <summary>Keyboard model</summary>
       <description>keyboard model</description>
     </key>
-    <key name="layouts" type="as">
+    <key type="as" name="layouts">
       <default>[]</default>
       <summary>Keyboard layout</summary>
       <description>keyboard layout</description>
     </key>
-    <key name="options" type="as">
+    <key type="as" name="options">
       <default>[]</default>
       <summary>Keyboard options</summary>
       <description>Keyboard options</description>
     </key>
   </schema>
-</schemalist>
+</schemalist>
\ No newline at end of file
diff --git a/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in b/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in
new file mode 100644
index 0000000..58d1822
--- /dev/null
+++ b/libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.libgnomekbd.keyboard" path="/desktop/gnome/peripherals/keyboard/kbd/">
+    <key name="model" type="s">
+      <default>''</default>
+      <_summary>Keyboard model</_summary>
+      <_description>keyboard model</_description>
+    </key>
+    <key name="layouts" type="as">
+      <default>[]</default>
+      <_summary>Keyboard layout</_summary>
+      <_description>keyboard layout</_description>
+    </key>
+    <key name="options" type="as">
+      <default>[]</default>
+      <_summary>Keyboard options</_summary>
+      <_description>Keyboard options</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 23a04ee..62ca5bb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,6 +6,9 @@ libgnomekbd/gkbd-keyboard-drawing.c
 libgnomekbd/gkbd-keyboard-config.c
 libgnomekbd/gkbd-status.c
 libgnomekbd/gkbd-util.c
+[type: gettext/xml]libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
+[type: gettext/xml]libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in
+[type: gettext/xml]libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in
 [type: gettext/glade]libgnomekbd/show-layout.ui
 [type: gettext/glade]capplet/gkbd-indicator-plugins.ui
 [type: gettext/glade]capplet/gkbd-indicator-plugins_add.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e658ed4..9a43758 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,4 @@
 capplet/gkbd-indicator-plugins-capplet.desktop.in
+libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in
+libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in