Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files

22 files changed, 536 insertions, 536 deletions

diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 950ecddf..5d1c4bfc 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -155,16 +155,15 @@ ui_DATA		= clock.ui
 xmluidir 	= $(datadir)/mate-panel/ui
 xmlui_DATA	= clock-menu.xml
 
-gsettings_SCHEMAS = org.mate.panel.applet.clock.gschema.xml
+clock_gschemas_in = org.mate.panel.applet.clock.gschema.xml.in
+gsettings_SCHEMAS = $(clock_gschemas_in:.xml.in=.xml)
+
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 EXTRA_DIST =						\
 	org.mate.panel.ClockApplet.mate-panel-applet.in.in	\
-	$(gsettings_SCHEMAS).in.in	\
+	$(clock_gschemas_in)				\
 	$(xmlui_DATA)					\
 	$(ui_DATA)					\
 	clock-marshallers.list				\
diff --git a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in
new file mode 100644
index 00000000..ee1b6902
--- /dev/null
+++ b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in
@@ -0,0 +1,88 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <enum id="org.mate.panel.applet.clock.ClockFormat">
+    <value nick="invalid" value="0"/>
+    <value nick="12-hour" value="1"/>
+    <value nick="24-hour" value="2"/>
+    <value nick="unix" value="3"/>
+    <value nick="internet" value="4"/>
+    <value nick="custom" value="5"/>
+  </enum>
+  <enum id="org.mate.panel.applet.clock.TemperatureUnit">
+    <value nick="Invalid" value="0"/>
+    <value nick="Default" value="1"/>
+    <value nick="Kelvin" value="2"/>
+    <value nick="Centigrade" value="3"/>
+    <value nick="Fahrenheit" value="4"/>
+  </enum>
+  <enum id="org.mate.panel.applet.clock.SpeedUnit">
+    <value nick="Invalid" value="0"/>
+    <value nick="Default" value="1"/>
+    <value nick="m/s" value="2"/>
+    <value nick="km/h" value="3"/>
+    <value nick="mph" value="4"/>
+    <value nick="knots" value="5"/>
+    <value nick="Beaufort scale" value="6"/>
+  </enum>
+  <schema id="org.mate.panel.applet.clock">
+    <key name="format" enum="org.mate.panel.applet.clock.ClockFormat">
+      <default>'24-hour'</default>
+      <summary>Hour format</summary>
+      <description>This key specifies the hour format used by the clock applet. Possible values are "12-hour", "24-hour", "internet", "unix" and "custom". If set to "internet", the clock will display Internet time. The Internet time system divides the day into 1000 ".beats". There are no time zones in this system, so time is the same all over the world. If set to "unix", the clock will display time in seconds since Epoch, i.e. 1970-01-01. If set to "custom", the clock will display time according to the format specified in the custom_format key.</description>
+    </key>
+    <key name="custom-format" type="s">
+      <default>''</default>
+      <summary>Custom format of the clock</summary>
+      <description>This key specifies the format used by the clock applet when the format key is set to "custom". You can use conversion specifiers understood by strftime() to obtain a specific format. See the strftime() manual for more information.</description>
+    </key>
+    <key name="show-seconds" type="b">
+      <default>false</default>
+      <summary>Show time with seconds</summary>
+      <description>If true, display seconds in time.</description>
+    </key>
+    <key name="show-date" type="b">
+      <default>true</default>
+      <summary>Show date in clock</summary>
+      <description>If true, display date in the clock, in addition to time.</description>
+    </key>
+    <key name="show-tooltip" type="b">
+      <default>true</default>
+      <summary>Show date in tooltip</summary>
+      <description>If true, show date in a tooltip when the pointer is over the clock.</description>
+    </key>
+    <key name="show-weather" type="b">
+      <default>true</default>
+      <summary>Show weather in clock</summary>
+      <description>If true, display a weather icon.</description>
+    </key>
+    <key name="show-temperature" type="b">
+      <default>true</default>
+      <summary>Show temperature in clock</summary>
+      <description>If true, show the temperature next to the weather icon.</description>
+    </key>
+    <key name="show-week-numbers" type="b">
+      <default>true</default>
+      <summary>Show week numbers in calendar</summary>
+      <description>If true, show week numbers in the calendar.</description>
+    </key>
+    <key name="expand-locations" type="b">
+      <default>false</default>
+      <summary>Expand list of locations</summary>
+      <description>If true, expand the list of locations in the calendar window.</description>
+    </key>
+    <key name="cities" type="as">
+      <default>[]</default>
+      <summary>List of locations</summary>
+      <description>A list of locations to display in the calendar window.</description>
+    </key>
+    <key name="temperature-unit" enum="org.mate.panel.applet.clock.TemperatureUnit">
+      <default>'Centigrade'</default>
+      <summary>Temperature unit</summary>
+      <description>The unit to use when showing temperatures.</description>
+    </key>
+    <key name="speed-unit" enum="org.mate.panel.applet.clock.SpeedUnit">
+      <default>'m/s'</default>
+      <summary>Speed unit</summary>
+      <description>The unit to use when showing wind speed.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in b/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in
deleted file mode 100644
index 9a24988f..00000000
--- a/applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in
+++ /dev/null
@@ -1,88 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <enum id="org.mate.panel.applet.clock.ClockFormat">
-    <value nick="invalid" value="0"/>
-    <value nick="12-hour" value="1"/>
-    <value nick="24-hour" value="2"/>
-    <value nick="unix" value="3"/>
-    <value nick="internet" value="4"/>
-    <value nick="custom" value="5"/>
-  </enum>
-  <enum id="org.mate.panel.applet.clock.TemperatureUnit">
-    <value nick="Invalid" value="0"/>
-    <value nick="Default" value="1"/>
-    <value nick="Kelvin" value="2"/>
-    <value nick="Centigrade" value="3"/>
-    <value nick="Fahrenheit" value="4"/>
-  </enum>
-  <enum id="org.mate.panel.applet.clock.SpeedUnit">
-    <value nick="Invalid" value="0"/>
-    <value nick="Default" value="1"/>
-    <value nick="m/s" value="2"/>
-    <value nick="km/h" value="3"/>
-    <value nick="mph" value="4"/>
-    <value nick="knots" value="5"/>
-    <value nick="Beaufort scale" value="6"/>
-  </enum>
-  <schema id="org.mate.panel.applet.clock">
-    <key name="format" enum="org.mate.panel.applet.clock.ClockFormat">
-      <default>'24-hour'</default>
-      <_summary>Hour format</_summary>
-      <_description>This key specifies the hour format used by the clock applet. Possible values are "12-hour", "24-hour", "internet", "unix" and "custom". If set to "internet", the clock will display Internet time. The Internet time system divides the day into 1000 ".beats". There are no time zones in this system, so time is the same all over the world. If set to "unix", the clock will display time in seconds since Epoch, i.e. 1970-01-01. If set to "custom", the clock will display time according to the format specified in the custom_format key.</_description>
-    </key>
-    <key name="custom-format" type="s">
-      <default>''</default>
-      <_summary>Custom format of the clock</_summary>
-      <_description>This key specifies the format used by the clock applet when the format key is set to "custom". You can use conversion specifiers understood by strftime() to obtain a specific format. See the strftime() manual for more information.</_description>
-    </key>
-    <key name="show-seconds" type="b">
-      <default>false</default>
-      <_summary>Show time with seconds</_summary>
-      <_description>If true, display seconds in time.</_description>
-    </key>
-    <key name="show-date" type="b">
-      <default>true</default>
-      <_summary>Show date in clock</_summary>
-      <_description>If true, display date in the clock, in addition to time.</_description>
-    </key>
-    <key name="show-tooltip" type="b">
-      <default>true</default>
-      <_summary>Show date in tooltip</_summary>
-      <_description>If true, show date in a tooltip when the pointer is over the clock.</_description>
-    </key>
-    <key name="show-weather" type="b">
-      <default>true</default>
-      <_summary>Show weather in clock</_summary>
-      <_description>If true, display a weather icon.</_description>
-    </key>
-    <key name="show-temperature" type="b">
-      <default>true</default>
-      <_summary>Show temperature in clock</_summary>
-      <_description>If true, show the temperature next to the weather icon.</_description>
-    </key>
-    <key name="show-week-numbers" type="b">
-      <default>true</default>
-      <_summary>Show week numbers in calendar</_summary>
-      <_description>If true, show week numbers in the calendar.</_description>
-    </key>
-    <key name="expand-locations" type="b">
-      <default>false</default>
-      <_summary>Expand list of locations</_summary>
-      <_description>If true, expand the list of locations in the calendar window.</_description>
-    </key>
-    <key name="cities" type="as">
-      <default>[]</default>
-      <_summary>List of locations</_summary>
-      <_description>A list of locations to display in the calendar window.</_description>
-    </key>
-    <key name="temperature-unit" enum="org.mate.panel.applet.clock.TemperatureUnit">
-      <default>'Centigrade'</default>
-      <_summary>Temperature unit</_summary>
-      <_description>The unit to use when showing temperatures.</_description>
-    </key>
-    <key name="speed-unit" enum="org.mate.panel.applet.clock.SpeedUnit">
-      <default>'m/s'</default>
-      <_summary>Speed unit</_summary>
-      <_description>The unit to use when showing wind speed.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index f8688bac..7f63cf5f 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -77,13 +77,11 @@ ui_DATA = fish.ui
 xmluidir = $(datadir)/mate-panel/ui
 xmlui_DATA = fish-menu.xml
 
-gsettings_SCHEMAS = org.mate.panel.applet.fish.gschema.xml
+fish_gschemas_in = org.mate.panel.applet.fish.gschema.xml.in
+gsettings_SCHEMAS = $(fish_gschemas_in:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 EXTRA_DIST = \
 	wanda.svg \
 	$(fishbitmaps_DATA) \
@@ -91,7 +89,7 @@ EXTRA_DIST = \
 	$(service_in_files) \
 	$(ui_DATA) \
 	$(xmlui_DATA) \
-	$(gsettings_SCHEMAS).in.in
+	$(fish_gschemas_in)
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS)
 
diff --git a/applets/fish/org.mate.panel.applet.fish.gschema.xml.in b/applets/fish/org.mate.panel.applet.fish.gschema.xml.in
new file mode 100644
index 00000000..a3c3fe77
--- /dev/null
+++ b/applets/fish/org.mate.panel.applet.fish.gschema.xml.in
@@ -0,0 +1,34 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.fish">
+    <key name="name" type="s">
+      <default>'Wanda'</default>
+      <summary>The fish's name</summary>
+      <description>A fish without a name is a pretty dull fish. Bring your fish to life by naming him.</description>
+    </key>
+    <key name="image" type="s">
+      <default>'wanda.png'</default>
+      <summary>The fish's animation pixmap</summary>
+      <description>This key specifies the filename of the pixmap which will be used for the animation displayed in the fish applet relative to the pixmap directory.</description>
+    </key>
+    <key name="command" type="s">
+      <default>'fortune'</default>
+      <summary>Command to execute on click</summary>
+      <description>This key specifies the command that will be tried to execute when the fish is clicked.</description>
+    </key>
+    <key name="frames" type="i">
+      <default>8</default>
+      <summary>Frames in fish's animation</summary>
+      <description>This key specifies the number of frames that will be displayed in the fish's animation.</description>
+    </key>
+    <key name="speed" type="d">
+      <default>0.3</default>
+      <summary>Pause per frame</summary>
+      <description>This key specifies the number of seconds each frame will be displayed.</description>
+    </key>
+    <key name="rotate" type="b">
+      <default>false</default>
+      <summary>Rotate on vertical panels</summary>
+      <description>If true, the fish's animation will be displayed rotated on vertical panels.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in b/applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in
deleted file mode 100644
index 6ab7bd07..00000000
--- a/applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.fish">
-    <key name="name" type="s">
-      <default>'Wanda'</default>
-      <_summary>The fish's name</_summary>
-      <_description>A fish without a name is a pretty dull fish. Bring your fish to life by naming him.</_description>
-    </key>
-    <key name="image" type="s">
-      <default>'wanda.png'</default>
-      <_summary>The fish's animation pixmap</_summary>
-      <_description>This key specifies the filename of the pixmap which will be used for the animation displayed in the fish applet relative to the pixmap directory.</_description>
-    </key>
-    <key name="command" type="s">
-      <default>'fortune'</default>
-      <_summary>Command to execute on click</_summary>
-      <_description>This key specifies the command that will be tried to execute when the fish is clicked.</_description>
-    </key>
-    <key name="frames" type="i">
-      <default>8</default>
-      <_summary>Frames in fish's animation</_summary>
-      <_description>This key specifies the number of frames that will be displayed in the fish's animation.</_description>
-    </key>
-    <key name="speed" type="d">
-      <default>0.3</default>
-      <_summary>Pause per frame</_summary>
-      <_description>This key specifies the number of seconds each frame will be displayed.</_description>
-    </key>
-    <key name="rotate" type="b">
-      <default>false</default>
-      <_summary>Rotate on vertical panels</_summary>
-      <_description>If true, the fish's animation will be displayed rotated on vertical panels.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index d7cba006..db61f873 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -84,21 +84,19 @@ xmlui_DATA  = \
 	showdesktop-menu.xml \
 	window-list-menu.xml
 
-gsettings_SCHEMAS = \
-	org.mate.panel.applet.window-list.gschema.xml \
-	org.mate.panel.applet.workspace-switcher.gschema.xml
+wncklet_gschemas_in = \
+	org.mate.panel.applet.window-list.gschema.xml.in \
+	org.mate.panel.applet.workspace-switcher.gschema.xml.in
+gsettings_SCHEMAS = $(wncklet_gschemas_in:.xml.in=.xml)
+
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 EXTRA_DIST = \
 	org.mate.panel.Wncklet.mate-panel-applet.in.in \
 	$(service_in_files) \
 	$(xmlui_DATA) \
-	org.mate.panel.applet.window-list.gschema.xml.in.in \
-	org.mate.panel.applet.workspace-switcher.gschema.xml.in.in \
+	$(wncklet_gschemas_in) \
 	$(ui_DATA)
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS)
diff --git a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in
new file mode 100644
index 00000000..0f2d871d
--- /dev/null
+++ b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <enum id="org.mate.panel.applet.window-list.GroupingType">
+    <value nick="never" value="0"/>
+    <value nick="auto" value="1"/>
+    <value nick="always" value="2"/>
+  </enum>
+  <schema id="org.mate.panel.applet.window-list">
+    <key name="display-all-workspaces" type="b">
+      <default>false</default>
+      <summary>Show windows from all workspaces</summary>
+      <description>If true, the window list will show windows from all workspaces. Otherwise it will only display windows from the current workspace.</description>
+    </key>
+    <key name="group-windows" enum="org.mate.panel.applet.window-list.GroupingType">
+      <default>'never'</default>
+      <summary>When to group windows</summary>
+      <description>Decides when to group windows from the same application on the window list. Possible values are "never", "auto" and "always".</description>
+    </key>
+    <key name="move-unminimized-windows" type="b">
+      <default>true</default>
+      <summary>Move windows to current workspace when unminimized</summary>
+      <description>If true, then when unminimizing a window, move it to the current workspace. Otherwise, switch to the workspace of the window.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in
deleted file mode 100644
index a9647379..00000000
--- a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <enum id="org.mate.panel.applet.window-list.GroupingType">
-    <value nick="never" value="0"/>
-    <value nick="auto" value="1"/>
-    <value nick="always" value="2"/>
-  </enum>
-  <schema id="org.mate.panel.applet.window-list">
-    <key name="display-all-workspaces" type="b">
-      <default>false</default>
-      <_summary>Show windows from all workspaces</_summary>
-      <_description>If true, the window list will show windows from all workspaces. Otherwise it will only display windows from the current workspace.</_description>
-    </key>
-    <key name="group-windows" enum="org.mate.panel.applet.window-list.GroupingType">
-      <default>'never'</default>
-      <_summary>When to group windows</_summary>
-      <_description>Decides when to group windows from the same application on the window list. Possible values are "never", "auto" and "always".</_description>
-    </key>
-    <key name="move-unminimized-windows" type="b">
-      <default>true</default>
-      <_summary>Move windows to current workspace when unminimized</_summary>
-      <_description>If true, then when unminimizing a window, move it to the current workspace. Otherwise, switch to the workspace of the window.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in
new file mode 100644
index 00000000..c49f472d
--- /dev/null
+++ b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.workspace-switcher">
+    <key name="display-workspace-names" type="b">
+      <default>false</default>
+      <summary>Display workspace names</summary>
+      <description>If true, the workspaces in the workspace switcher will display the names of the workspaces. Otherwise they will display the windows on the workspace. This setting only works when the window manager is Marco.</description>
+    </key>
+    <key name="display-all-workspaces" type="b">
+      <default>true</default>
+      <summary>Display all workspaces</summary>
+      <description>If true, the workspace switcher will show all workspaces. Otherwise it will only show the current workspace.</description>
+    </key>
+    <key name="num-rows" type="i">
+      <default>1</default>
+      <summary>Rows in workspace switcher</summary>
+      <description>This key specifies how many rows (for horizontal layout) or columns (for vertical layout) the workspace switcher shows the workspaces in. This key is only relevant if the display_all_workspaces key is true.</description>
+    </key>
+    <key name="wrap-workspaces" type="b">
+      <default>false</default>
+      <summary>Wrap around on scroll</summary>
+      <description>If true, the workspace switcher will allow wrap-around, which means switching from the first to the last workspace and vice versa via scrolling.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in
deleted file mode 100644
index 82a20922..00000000
--- a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.workspace-switcher">
-    <key name="display-workspace-names" type="b">
-      <default>false</default>
-      <_summary>Display workspace names</_summary>
-      <_description>If true, the workspaces in the workspace switcher will display the names of the workspaces. Otherwise they will display the windows on the workspace. This setting only works when the window manager is Marco.</_description>
-    </key>
-    <key name="display-all-workspaces" type="b">
-      <default>true</default>
-      <_summary>Display all workspaces</_summary>
-      <_description>If true, the workspace switcher will show all workspaces. Otherwise it will only show the current workspace.</_description>
-    </key>
-    <key name="num-rows" type="i">
-      <default>1</default>
-      <_summary>Rows in workspace switcher</_summary>
-      <_description>This key specifies how many rows (for horizontal layout) or columns (for vertical layout) the workspace switcher shows the workspaces in. This key is only relevant if the display_all_workspaces key is true.</_description>
-    </key>
-    <key name="wrap-workspaces" type="b">
-      <default>false</default>
-      <_summary>Wrap around on scroll</_summary>
-      <_description>If true, the workspace switcher will allow wrap-around, which means switching from the first to the last workspace and vice versa via scrolling.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/configure.ac b/configure.ac
index 94922b1b..94d59bb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_SUBST(LIB_MATE_PANEL_APPLET_LT_VERSION)
 AM_MAINTAINER_MODE
 MATE_MAINTAINER_MODE_DEFINES
 
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 AC_PROG_CC
 AC_STDC_HEADERS
@@ -308,6 +308,10 @@ AC_SUBST(REBUILD)
 AC_OUTPUT([
 Makefile
 data/Makefile
+data/org.mate.panel.gschema.xml
+data/org.mate.panel.menubar.gschema.xml
+data/org.mate.panel.object.gschema.xml
+data/org.mate.panel.toplevel.gschema.xml
 icons/Makefile
 icons/16x16/Makefile
 icons/22x22/Makefile
@@ -326,10 +330,14 @@ libmate-panel-applet/Makefile
 po/Makefile.in
 applets/Makefile
 applets/clock/Makefile
+applets/clock/org.mate.panel.applet.clock.gschema.xml
 applets/clock/pixmaps/Makefile
 applets/fish/Makefile
+applets/fish/org.mate.panel.applet.fish.gschema.xml
 applets/notification_area/Makefile
 applets/wncklet/Makefile
+applets/wncklet/org.mate.panel.applet.window-list.gschema.xml
+applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml
 doc/Makefile
 doc/reference/Makefile
 doc/reference/mate-panel-applet/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 7e13b47d..f66c331c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,16 +12,15 @@ layout_DATA = \
 gsettings_ENUM_NAMESPACE = org.mate.panel
 gsettings_ENUM_FILES = $(top_srcdir)/mate-panel/panel-enums-gsettings.h
 
-panel_gschemas_in_in = \
-	org.mate.panel.gschema.xml.in.in \
-	org.mate.panel.object.gschema.xml.in.in \
-	org.mate.panel.toplevel.gschema.xml.in.in \
-	org.mate.panel.menubar.gschema.xml.in.in
+panel_gschemas_in = \
+	org.mate.panel.gschema.xml.in \
+	org.mate.panel.object.gschema.xml.in \
+	org.mate.panel.toplevel.gschema.xml.in \
+	org.mate.panel.menubar.gschema.xml.in
 
-panel_gschemas_in = $(panel_gschemas_in_in:.xml.in.in=.xml.in)
 gsettings_SCHEMAS = $(panel_gschemas_in:.xml.in=.xml)
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
+%.gschema.xml: %.gschema.xml.in Makefile
 	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
 
 @GSETTINGS_RULES@
@@ -31,9 +30,7 @@ convert_DATA = mate-panel.convert
 
 EXTRA_DIST = \
 	$(convert_DATA) \
-	$(panel_gschemas_in_in) \
+	$(panel_gschemas_in) \
 	$(layout_DATA)
 
-CLEANFILES = \
-	$(panel_gschemas_in) \
-	$(gsettings_SCHEMAS)
+CLEANFILES = $(gsettings_SCHEMAS)
diff --git a/data/org.mate.panel.gschema.xml.in b/data/org.mate.panel.gschema.xml.in
new file mode 100644
index 00000000..241af62e
--- /dev/null
+++ b/data/org.mate.panel.gschema.xml.in
@@ -0,0 +1,78 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel" path="/org/mate/panel/general/">
+    <key name="default-layout" type="s">
+      <default>'default'</default>
+      <summary>Default panel layout</summary>
+      <description>The default panels layout to use when panels are created or resetted.</description>
+    </key>
+    <key name="enable-program-list" type="b">
+      <default>true</default>
+      <summary>Enable program list in "Run Application" dialog</summary>
+      <description>If true, the "Known Applications" listing in the "Run Application" dialog is made available. Whether or not the listing is expanded when the dialog is shown is controlled by the show_program_list key.</description>
+    </key>
+    <key name="show-program-list" type="b">
+      <default>false</default>
+      <summary>Expand program list in "Run Application" dialog</summary>
+      <description>If true, the "Known Applications" listing in the "Run Application" dialog is expanded when the dialog is opened. This key is only relevant if the enable_program_list key is true.</description>
+    </key>
+    <key name="enable-autocompletion" type="b">
+      <default>true</default>
+      <summary>Enable autocompletion in "Run Application" dialog</summary>
+      <description>If true, autocompletion in the "Run Application" dialog is made available.</description>
+    </key>
+    <key name="history-mate-run" type="as">
+      <default>[]</default>
+      <summary>History for "Run Application" dialog</summary>
+      <description>This is the list of commands used in "Run Application" dialog.</description>
+    </key>
+    <key name="toplevel-id-list" type="as">
+      <default>[]</default>
+      <summary>Panel ID list</summary>
+      <description>A list of panel IDs. Each ID identifies an individual toplevel panel. The settings for each of these panels are stored in /apps/panel/toplevels/$(id).</description>
+    </key>
+    <key name="object-id-list" type="as">
+      <default>[]</default>
+      <summary>Panel object ID list</summary>
+      <description>A list of panel object IDs. Each ID identifies an individual panel object (e.g. a launcher, action button or menu button/bar). The settings for each of these objects are stored in /apps/panel/objects/$(id).</description>
+    </key>
+    <key name="tooltips-enabled" type="b">
+      <default>true</default>
+      <summary>Enable tooltips</summary>
+      <description>If true, tooltips are shown for objects in panels.</description>
+    </key>
+    <key name="enable-animations" type="b">
+      <default>true</default>
+      <summary>Enable animations</summary>
+    </key>
+    <key name="drawer-autoclose" type="b">
+      <default>true</default>
+      <summary>Autoclose drawer</summary>
+      <description>If true, a drawer will automatically be closed when the user clicks a launcher in it.</description>
+    </key>
+    <key name="confirm-panel-remove" type="b">
+      <default>true</default>
+      <summary>Confirm panel removal</summary>
+      <description>If true, a dialog is shown asking for confirmation if the user wants to remove a panel.</description>
+    </key>
+    <key name="highlight-launchers-on-mouseover" type="b">
+      <default>true</default>
+      <summary>Highlight launchers on mouseover</summary>
+      <description>If true, a launcher is highlighted when the user moves the pointer over it.</description>
+    </key>
+    <key name="locked-down" type="b">
+      <default>false</default>
+      <summary>Complete panel lockdown</summary>
+      <description>If true, the panel will not allow any changes to the configuration of the panel.  Individual applets may need to be locked down separately however. The panel must be restarted for this to take effect.</description>
+    </key>
+    <key name="disabled-applets" type="as">
+      <default>[]</default>
+      <summary>Applet IIDs to disable from loading</summary>
+      <description>A list of applet IIDs that the panel will ignore.  This way you can disable certain applets from loading or showing up in the menu. For example to disable the mini-commander applet add 'OAFIID:MATE_MiniCommanderApplet' to this list.  The panel must be restarted for this to take effect.</description>
+    </key>
+    <key name="disable-force-quit" type="b">
+      <default>false</default>
+      <summary>Disable Force Quit</summary>
+      <description>If true, the panel will not allow a user to force an application to quit by removing access to the force quit button.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.panel.gschema.xml.in.in b/data/org.mate.panel.gschema.xml.in.in
deleted file mode 100644
index f302651a..00000000
--- a/data/org.mate.panel.gschema.xml.in.in
+++ /dev/null
@@ -1,78 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel" path="/org/mate/panel/general/">
-    <key name="default-layout" type="s">
-      <default>'default'</default>
-      <_summary>Default panel layout</_summary>
-      <_description>The default panels layout to use when panels are created or resetted.</_description>
-    </key>
-    <key name="enable-program-list" type="b">
-      <default>true</default>
-      <_summary>Enable program list in "Run Application" dialog</_summary>
-      <_description>If true, the "Known Applications" listing in the "Run Application" dialog is made available. Whether or not the listing is expanded when the dialog is shown is controlled by the show_program_list key.</_description>
-    </key>
-    <key name="show-program-list" type="b">
-      <default>false</default>
-      <_summary>Expand program list in "Run Application" dialog</_summary>
-      <_description>If true, the "Known Applications" listing in the "Run Application" dialog is expanded when the dialog is opened. This key is only relevant if the enable_program_list key is true.</_description>
-    </key>
-    <key name="enable-autocompletion" type="b">
-      <default>true</default>
-      <_summary>Enable autocompletion in "Run Application" dialog</_summary>
-      <_description>If true, autocompletion in the "Run Application" dialog is made available.</_description>
-    </key>
-    <key name="history-mate-run" type="as">
-      <default>[]</default>
-      <_summary>History for "Run Application" dialog</_summary>
-      <_description>This is the list of commands used in "Run Application" dialog.</_description>
-    </key>
-    <key name="toplevel-id-list" type="as">
-      <default>[]</default>
-      <_summary>Panel ID list</_summary>
-      <_description>A list of panel IDs. Each ID identifies an individual toplevel panel. The settings for each of these panels are stored in /apps/panel/toplevels/$(id).</_description>
-    </key>
-    <key name="object-id-list" type="as">
-      <default>[]</default>
-      <_summary>Panel object ID list</_summary>
-      <_description>A list of panel object IDs. Each ID identifies an individual panel object (e.g. a launcher, action button or menu button/bar). The settings for each of these objects are stored in /apps/panel/objects/$(id).</_description>
-    </key>
-    <key name="tooltips-enabled" type="b">
-      <default>true</default>
-      <_summary>Enable tooltips</_summary>
-      <_description>If true, tooltips are shown for objects in panels.</_description>
-    </key>
-    <key name="enable-animations" type="b">
-      <default>true</default>
-      <_summary>Enable animations</_summary>
-    </key>
-    <key name="drawer-autoclose" type="b">
-      <default>true</default>
-      <_summary>Autoclose drawer</_summary>
-      <_description>If true, a drawer will automatically be closed when the user clicks a launcher in it.</_description>
-    </key>
-    <key name="confirm-panel-remove" type="b">
-      <default>true</default>
-      <_summary>Confirm panel removal</_summary>
-      <_description>If true, a dialog is shown asking for confirmation if the user wants to remove a panel.</_description>
-    </key>
-    <key name="highlight-launchers-on-mouseover" type="b">
-      <default>true</default>
-      <_summary>Highlight launchers on mouseover</_summary>
-      <_description>If true, a launcher is highlighted when the user moves the pointer over it.</_description>
-    </key>
-    <key name="locked-down" type="b">
-      <default>false</default>
-      <_summary>Complete panel lockdown</_summary>
-      <_description>If true, the panel will not allow any changes to the configuration of the panel.  Individual applets may need to be locked down separately however. The panel must be restarted for this to take effect.</_description>
-    </key>
-    <key name="disabled-applets" type="as">
-      <default>[]</default>
-      <_summary>Applet IIDs to disable from loading</_summary>
-      <_description>A list of applet IIDs that the panel will ignore.  This way you can disable certain applets from loading or showing up in the menu. For example to disable the mini-commander applet add 'OAFIID:MATE_MiniCommanderApplet' to this list.  The panel must be restarted for this to take effect.</_description>
-    </key>
-    <key name="disable-force-quit" type="b">
-      <default>false</default>
-      <_summary>Disable Force Quit</_summary>
-      <_description>If true, the panel will not allow a user to force an application to quit by removing access to the force quit button.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/org.mate.panel.menubar.gschema.xml.in b/data/org.mate.panel.menubar.gschema.xml.in
new file mode 100644
index 00000000..0c707412
--- /dev/null
+++ b/data/org.mate.panel.menubar.gschema.xml.in
@@ -0,0 +1,29 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.menubar" path="/org/mate/panel/menubar/">
+    <key name="show-applications" type="b">
+      <default>true</default>
+      <summary>Show applications menu</summary>
+      <description>If true, show applications item in menu bar.</description>
+    </key>
+    <key name="show-places" type="b">
+      <default>true</default>
+      <summary>Show places menu</summary>
+      <description>If true, show places item in menu bar.</description>
+    </key>
+    <key name="show-desktop" type="b">
+      <default>true</default>
+      <summary>Show desktop menu</summary>
+      <description>If true, show desktop item in menu bar.</description>
+    </key>
+    <key name="show-icon" type="b">
+      <default>true</default>
+      <summary>Show icon</summary>
+      <description>If true, show icon in menu bar.</description>
+    </key>
+    <key name="icon-name" type="s">
+      <default>'start-here'</default>
+      <summary>Icon to show in menu bar</summary>
+      <description>Set the theme icon name to use in menu bar.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.panel.menubar.gschema.xml.in.in b/data/org.mate.panel.menubar.gschema.xml.in.in
deleted file mode 100644
index 9c7ed19f..00000000
--- a/data/org.mate.panel.menubar.gschema.xml.in.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.menubar" path="/org/mate/panel/menubar/">
-    <key name="show-applications" type="b">
-      <default>true</default>
-      <_summary>Show applications menu</_summary>
-      <_description>If true, show applications item in menu bar.</_description>
-    </key>
-    <key name="show-places" type="b">
-      <default>true</default>
-      <_summary>Show places menu</_summary>
-      <_description>If true, show places item in menu bar.</_description>
-    </key>
-    <key name="show-desktop" type="b">
-      <default>true</default>
-      <_summary>Show desktop menu</_summary>
-      <_description>If true, show desktop item in menu bar.</_description>
-    </key>
-    <key name="show-icon" type="b">
-      <default>true</default>
-      <_summary>Show icon</_summary>
-      <_description>If true, show icon in menu bar.</_description>
-    </key>
-    <key name="icon-name" type="s">
-      <default>'start-here'</default>
-      <_summary>Icon to show in menu bar</_summary>
-      <_description>Set the theme icon name to use in menu bar.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/org.mate.panel.object.gschema.xml.in b/data/org.mate.panel.object.gschema.xml.in
new file mode 100644
index 00000000..913d8b8c
--- /dev/null
+++ b/data/org.mate.panel.object.gschema.xml.in
@@ -0,0 +1,79 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.object">
+    <key name="object-type" enum="org.mate.panel.PanelObjectType">
+      <default>'launcher'</default>
+      <summary>Panel object type</summary>
+      <description>The type of this panel object.</description>
+    </key>
+    <key name="toplevel-id" type="s">
+      <default>''</default>
+      <summary>Toplevel panel containing object</summary>
+      <description>The identifier of the toplevel panel which contains this object.</description>
+    </key>
+    <key name="position" type="i">
+      <default>0</default>
+      <summary>Object's position on the panel</summary>
+      <description>The position of this panel object. The position is specified by the number of pixels from the left (or top if vertical) panel edge.</description>
+    </key>
+    <key name="panel-right-stick" type="b">
+      <default>false</default>
+      <summary>Interpret position relative to bottom/right edge</summary>
+      <description>If true, the position of the object is interpreted relative to the right (or bottom if vertical) edge of the panel.</description>
+    </key>
+    <key name="locked" type="b">
+      <default>false</default>
+      <summary>Lock the object to the panel</summary>
+      <description>If true, the user may not move the applet without first unlocking the object using the "Unlock" menuitem.</description>
+    </key>
+    <key name="applet-iid" type="s">
+      <default>''</default>
+      <summary>Applet IID</summary>
+      <description>The implementation ID of the applet - e.g. "ClockAppletFactory::ClockApplet". This key is only relevant if the object_type key is "external-applet" (or the deprecated "matecomponent-applet").</description>
+    </key>
+    <key name="attached-toplevel-id" type="s">
+      <default>''</default>
+      <summary>Panel attached to drawer</summary>
+      <description>The identifier of the panel attached to this drawer. This key is only relevant if the object_type key is "drawer-object".</description>
+    </key>
+    <key name="tooltip" type="s">
+      <default>''</default>
+      <summary>Tooltip displayed for drawer or menu</summary>
+      <description>The text to display in a tooltip for this drawer or this menu. This key is only relevant if the object_type key is "drawer-object" or "menu-object".</description>
+    </key>
+    <key name="use-custom-icon" type="b">
+      <default>false</default>
+      <summary>Use custom icon for object's button</summary>
+      <description>If true, the custom_icon key is used as a custom icon for the button. If false, the custom_icon key is ignored. This key is only relevant if the object_type key is "menu-object" or "drawer-object".</description>
+    </key>
+    <key name="custom-icon" type="s">
+      <default>''</default>
+      <summary>Icon used for object's button</summary>
+      <description>The location of the image file used as the icon for the object's button. This key is only relevant if the object_type key is "drawer-object" or "menu-object" and the use_custom_icon key is true.</description>
+    </key>
+    <key name="use-menu-path" type="b">
+      <default>false</default>
+      <summary>Use custom path for menu contents</summary>
+      <description>If true, the menu_path key is used as the path from which the menu contents should be constructed. If false, the menu_path key is ignored. This key is only relevant if the object_type key is "menu-object".</description>
+    </key>
+    <key name="menu-path" type="s">
+      <default>'applications:/'</default>
+      <summary>Menu content path</summary>
+      <description>The path from which the menu contents is contructed. This key is only relevant if the use_menu_path key is true and the object_type key is "menu-object".</description>
+    </key>
+    <key name="has-arrow" type="b">
+      <default>true</default>
+      <summary>Draw arrow in menu button</summary>
+      <description>If true, an arrow is drawn over the menu button icon. If false, menu button has only the icon.</description>
+    </key>
+    <key name="launcher-location" type="s">
+      <default>''</default>
+      <summary>Launcher location</summary>
+      <description>The location of the .desktop file describing the launcher. This key is only relevant if the object_type key is "launcher-object".</description>
+    </key>
+    <key name="action-type" enum="org.mate.panel.PanelActionButtonType">
+      <default>'none'</default>
+      <summary>Action button type</summary>
+      <description>The action type this button represents. Possible values are "lock", "logout", "run", "search" and "screenshot". This key is only relevant if the object_type key is "action-applet".</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.panel.object.gschema.xml.in.in b/data/org.mate.panel.object.gschema.xml.in.in
deleted file mode 100644
index 90c4a1bf..00000000
--- a/data/org.mate.panel.object.gschema.xml.in.in
+++ /dev/null
@@ -1,79 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.object">
-    <key name="object-type" enum="org.mate.panel.PanelObjectType">
-      <default>'launcher'</default>
-      <_summary>Panel object type</_summary>
-      <_description>The type of this panel object.</_description>
-    </key>
-    <key name="toplevel-id" type="s">
-      <default>''</default>
-      <_summary>Toplevel panel containing object</_summary>
-      <_description>The identifier of the toplevel panel which contains this object.</_description>
-    </key>
-    <key name="position" type="i">
-      <default>0</default>
-      <_summary>Object's position on the panel</_summary>
-      <_description>The position of this panel object. The position is specified by the number of pixels from the left (or top if vertical) panel edge.</_description>
-    </key>
-    <key name="panel-right-stick" type="b">
-      <default>false</default>
-      <_summary>Interpret position relative to bottom/right edge</_summary>
-      <_description>If true, the position of the object is interpreted relative to the right (or bottom if vertical) edge of the panel.</_description>
-    </key>
-    <key name="locked" type="b">
-      <default>false</default>
-      <_summary>Lock the object to the panel</_summary>
-      <_description>If true, the user may not move the applet without first unlocking the object using the "Unlock" menuitem.</_description>
-    </key>
-    <key name="applet-iid" type="s">
-      <default>''</default>
-      <_summary>Applet IID</_summary>
-      <_description>The implementation ID of the applet - e.g. "ClockAppletFactory::ClockApplet". This key is only relevant if the object_type key is "external-applet" (or the deprecated "matecomponent-applet").</_description>
-    </key>
-    <key name="attached-toplevel-id" type="s">
-      <default>''</default>
-      <_summary>Panel attached to drawer</_summary>
-      <_description>The identifier of the panel attached to this drawer. This key is only relevant if the object_type key is "drawer-object".</_description>
-    </key>
-    <key name="tooltip" type="s">
-      <default>''</default>
-      <_summary>Tooltip displayed for drawer or menu</_summary>
-      <_description>The text to display in a tooltip for this drawer or this menu. This key is only relevant if the object_type key is "drawer-object" or "menu-object".</_description>
-    </key>
-    <key name="use-custom-icon" type="b">
-      <default>false</default>
-      <_summary>Use custom icon for object's button</_summary>
-      <_description>If true, the custom_icon key is used as a custom icon for the button. If false, the custom_icon key is ignored. This key is only relevant if the object_type key is "menu-object" or "drawer-object".</_description>
-    </key>
-    <key name="custom-icon" type="s">
-      <default>''</default>
-      <_summary>Icon used for object's button</_summary>
-      <_description>The location of the image file used as the icon for the object's button. This key is only relevant if the object_type key is "drawer-object" or "menu-object" and the use_custom_icon key is true.</_description>
-    </key>
-    <key name="use-menu-path" type="b">
-      <default>false</default>
-      <_summary>Use custom path for menu contents</_summary>
-      <_description>If true, the menu_path key is used as the path from which the menu contents should be constructed. If false, the menu_path key is ignored. This key is only relevant if the object_type key is "menu-object".</_description>
-    </key>
-    <key name="menu-path" type="s">
-      <default>'applications:/'</default>
-      <_summary>Menu content path</_summary>
-      <_description>The path from which the menu contents is contructed. This key is only relevant if the use_menu_path key is true and the object_type key is "menu-object".</_description>
-    </key>
-    <key name="has-arrow" type="b">
-      <default>true</default>
-      <_summary>Draw arrow in menu button</_summary>
-      <_description>If true, an arrow is drawn over the menu button icon. If false, menu button has only the icon.</_description>
-    </key>
-    <key name="launcher-location" type="s">
-      <default>''</default>
-      <_summary>Launcher location</_summary>
-      <_description>The location of the .desktop file describing the launcher. This key is only relevant if the object_type key is "launcher-object".</_description>
-    </key>
-    <key name="action-type" enum="org.mate.panel.PanelActionButtonType">
-      <default>'none'</default>
-      <_summary>Action button type</_summary>
-      <_description>The action type this button represents. Possible values are "lock", "logout", "run", "search" and "screenshot". This key is only relevant if the object_type key is "action-applet".</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/org.mate.panel.toplevel.gschema.xml.in b/data/org.mate.panel.toplevel.gschema.xml.in
new file mode 100644
index 00000000..25e712c1
--- /dev/null
+++ b/data/org.mate.panel.toplevel.gschema.xml.in
@@ -0,0 +1,142 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.toplevel">
+    <key name="name" type="s">
+      <default>''</default>
+      <summary>Name to identify panel</summary>
+      <description>This is a human readable name which you can use to identify a panel. Its main purpose is to serve as the panel's window title which is useful when navigating between panels.</description>
+    </key>
+    <key name="screen" type="i">
+      <default>0</default>
+      <summary>X screen where the panel is displayed</summary>
+      <description>With a multi-screen setup, you may have panels on each individual screen. This key identifies the current screen the panel is displayed on.</description>
+    </key>
+    <key name="monitor" type="i">
+      <default>0</default>
+      <summary>Xinerama monitor where the panel is displayed</summary>
+      <description>In a Xinerama setup, you may have panels on each individual monitor. This key identifies the current monitor the panel is displayed on.</description>
+    </key>
+    <key name="expand" type="b">
+      <default>true</default>
+      <summary>Expand to occupy entire screen width</summary>
+      <description>If true, the panel will occupy the entire screen width (height if this is a vertical panel). In this mode the panel can only be placed at a screen edge. If false, the panel will only be large enough to accommodate the applets, launchers and buttons on the panel.</description>
+    </key>
+    <key name="orientation" enum="org.mate.panel.PanelOrientation">
+      <default>'top'</default>
+      <summary>Panel orientation</summary>
+      <description>The orientation of the panel. Possible values are "top", "bottom", "left", "right". In expanded mode the key specifies which screen edge the panel is on. In un-expanded mode the difference between "top" and "bottom" is less important - both indicate that this is a horizontal panel - but still give a useful hint as to how some panel objects should behave. For example, on a "top" panel a menu button will pop up its menu below the panel, whereas on a "bottom" panel the menu will be popped up above the panel.</description>
+    </key>
+    <key name="size" type="i">
+      <default>24</default>
+      <summary>Panel size</summary>
+      <description>The height (width for a vertical panel) of the panel. The panel will determine at runtime a minimum size based on the font size and other indicators. The maximum size is fixed at one quarter of the screen height (or width).</description>
+    </key>
+    <key name="x" type="i">
+      <default>0</default>
+      <summary>X co-ordinate of panel</summary>
+      <description>The location of the panel along the x-axis. This key is only relevant in un-expanded mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the orientation key.</description>
+    </key>
+    <key name="y" type="i">
+      <default>0</default>
+      <summary>Y co-ordinate of panel</summary>
+      <description>The location of the panel along the y-axis. This key is only relevant in un-expanded mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the orientation key.</description>
+    </key>
+    <key name="x-right" type="i">
+      <default>-1</default>
+      <summary>X co-ordinate of panel, starting from the right of the screen</summary>
+      <description>The location of the panel along the x-axis, starting from the right of  the screen. If set to -1, the value is ignored and the value of the x key is used. If the value is greater than 0, then the value of the x key is ignored. This key is only relevant in un-expanded mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the orientation key.</description>
+    </key>
+    <key name="y-bottom" type="i">
+      <default>-1</default>
+      <summary>Y co-ordinate of panel, starting from the bottom of the screen</summary>
+      <description>The location of the panel along the y-axis, starting from the bottom of  the screen. If set to -1, the value is ignored and the value of the y key is used. If the value is greater than 0, then the value of the y key is ignored. This key is only relevant in un-expanded mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the orientation key.</description>
+    </key>
+    <key name="x-centered" type="b">
+      <default>false</default>
+      <summary>Center panel on x-axis</summary>
+      <description>If true, the x and x_right keys are ignored and the panel is placed at the center of the x-axis of the screen. If the panel is resized it will remain at that position - i.e. the panel will grow on both sides. If false, the x and x_right keys specify the location of the panel.</description>
+    </key>
+    <key name="y-centered" type="b">
+      <default>false</default>
+      <summary>Center panel on y-axis</summary>
+      <description>If true, the y and y_bottom keys are ignored and the panel is placed at the center of the y-axis of the screen. If the panel is resized it will remain at that position - i.e. the panel will grow on both sides. If false, the y and y_bottom keys specify the location of the panel.</description>
+    </key>
+    <key name="auto-hide" type="b">
+      <default>false</default>
+      <summary>Automatically hide panel into corner</summary>
+      <description>If true, the panel is automatically hidden into a corner of the screen when the pointer leaves the panel area. Moving the pointer to that corner again will cause the panel to re-appear.</description>
+    </key>
+    <key name="enable-animations" type="b">
+      <default>true</default>
+      <summary>Enable animations</summary>
+      <description>If true, hiding and un-hiding of this panel will be animated rather than happening instantly.</description>
+    </key>
+    <key name="enable-buttons" type="b">
+      <default>false</default>
+      <summary>Enable hide buttons</summary>
+      <description>If true, buttons will be placed on each side of the panel which may be used to move the panel to edge of the screen, leaving only a button showing.</description>
+    </key>
+    <key name="enable-arrows" type="b">
+      <default>true</default>
+      <summary>Enable arrows on hide buttons</summary>
+      <description>If true, arrows will be placed on the hide buttons. This key is only relevant if the enable_buttons key is true.</description>
+    </key>
+    <key name="hide-delay" type="i">
+      <default>300</default>
+      <summary>Panel autohide delay</summary>
+      <description>Specifies the number of milliseconds delay after the pointer leaves the panel area before the panel is automatically hidden. This key is only relevant if the auto_hide key is true.</description>
+    </key>
+    <key name="unhide-delay" type="i">
+      <default>100</default>
+      <summary>Panel autounhide delay</summary>
+      <description>Specifies the number of milliseconds delay after the pointer enters the panel area before the panel is automatically re-shown. This key is only relevant if the auto_hide key is true.</description>
+    </key>
+    <key name="auto-hide-size" type="i">
+      <default>1</default>
+      <summary>Visible pixels when hidden</summary>
+      <description>Specifies the number of pixels visible when the panel is automatically hidden into a corner. This key is only relevant if the auto_hide key is true.</description>
+    </key>
+    <key name="animation-speed" enum="org.mate.panel.PanelAnimationSpeed">
+      <default>'fast'</default>
+      <summary>Animation speed</summary>
+      <description>The speed in which panel animations should occur. Possible values are "slow", "medium" and "fast". This key is only relevant if the enable_animations key is true.</description>
+    </key>
+    <child name="background" schema="org.mate.panel.toplevel.background"/>
+  </schema>
+  <schema id="org.mate.panel.toplevel.background">
+    <key name="type" enum="org.mate.panel.PanelBackgroundType">
+      <default>'none'</default>
+      <summary>Background type</summary>
+      <description>Which type of background should be used for this panel. Possible values are "none" - the default GTK+ widget background will be used, "color" - the color key will be used as background color or "image" - the image specified by the image key will be used as background.</description>
+    </key>
+    <key name="color" type="s">
+      <default>'#ffffff'</default>
+      <summary>Background color</summary>
+      <description>Specifies the background color for the panel in #RGB format.</description>
+    </key>
+    <key name="opacity" type="i">
+      <default>6000</default>
+      <summary>Background color opacity</summary>
+      <description>Specifies the opacity of the background color format. If the color is not completely opaque (a value of less than 65535), the color will be composited onto the desktop background image.</description>
+    </key>
+    <key name="image" type="s">
+      <default>''</default>
+      <summary>Background image</summary>
+      <description>Specifies the file to be used for the background image. If the image contains an alpha channel it will be composited onto the desktop background image.</description>
+    </key>
+    <key name="fit" type="b">
+      <default>false</default>
+      <summary>Fit image to panel</summary>
+      <description>If true, the image will be scaled (retaining the aspect ratio of the image) to the panel height (if horizontal).</description>
+    </key>
+    <key name="stretch" type="b">
+      <default>false</default>
+      <summary>Stretch image to panel</summary>
+      <description>If true, the image will be scaled to the panel dimensions. The aspect ratio of the image will not be maintained.</description>
+    </key>
+    <key name="rotate" type="b">
+      <default>false</default>
+      <summary>Rotate image on vertical panels</summary>
+      <description>If true, the background image will be rotated when the panel is oriented vertically.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.panel.toplevel.gschema.xml.in.in b/data/org.mate.panel.toplevel.gschema.xml.in.in
deleted file mode 100644
index ffffb6cf..00000000
--- a/data/org.mate.panel.toplevel.gschema.xml.in.in
+++ /dev/null
@@ -1,142 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.toplevel">
-    <key name="name" type="s">
-      <default>''</default>
-      <_summary>Name to identify panel</_summary>
-      <_description>This is a human readable name which you can use to identify a panel. Its main purpose is to serve as the panel's window title which is useful when navigating between panels.</_description>
-    </key>
-    <key name="screen" type="i">
-      <default>0</default>
-      <_summary>X screen where the panel is displayed</_summary>
-      <_description>With a multi-screen setup, you may have panels on each individual screen. This key identifies the current screen the panel is displayed on.</_description>
-    </key>
-    <key name="monitor" type="i">
-      <default>0</default>
-      <_summary>Xinerama monitor where the panel is displayed</_summary>
-      <_description>In a Xinerama setup, you may have panels on each individual monitor. This key identifies the current monitor the panel is displayed on.</_description>
-    </key>
-    <key name="expand" type="b">
-      <default>true</default>
-      <_summary>Expand to occupy entire screen width</_summary>
-      <_description>If true, the panel will occupy the entire screen width (height if this is a vertical panel). In this mode the panel can only be placed at a screen edge. If false, the panel will only be large enough to accommodate the applets, launchers and buttons on the panel.</_description>
-    </key>
-    <key name="orientation" enum="org.mate.panel.PanelOrientation">
-      <default>'top'</default>
-      <_summary>Panel orientation</_summary>
-      <_description>The orientation of the panel. Possible values are "top", "bottom", "left", "right". In expanded mode the key specifies which screen edge the panel is on. In un-expanded mode the difference between "top" and "bottom" is less important - both indicate that this is a horizontal panel - but still give a useful hint as to how some panel objects should behave. For example, on a "top" panel a menu button will pop up its menu below the panel, whereas on a "bottom" panel the menu will be popped up above the panel.</_description>
-    </key>
-    <key name="size" type="i">
-      <default>24</default>
-      <_summary>Panel size</_summary>
-      <_description>The height (width for a vertical panel) of the panel. The panel will determine at runtime a minimum size based on the font size and other indicators. The maximum size is fixed at one quarter of the screen height (or width).</_description>
-    </key>
-    <key name="x" type="i">
-      <default>0</default>
-      <_summary>X co-ordinate of panel</_summary>
-      <_description>The location of the panel along the x-axis. This key is only relevant in un-expanded mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the orientation key.</_description>
-    </key>
-    <key name="y" type="i">
-      <default>0</default>
-      <_summary>Y co-ordinate of panel</_summary>
-      <_description>The location of the panel along the y-axis. This key is only relevant in un-expanded mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the orientation key.</_description>
-    </key>
-    <key name="x-right" type="i">
-      <default>-1</default>
-      <_summary>X co-ordinate of panel, starting from the right of the screen</_summary>
-      <_description>The location of the panel along the x-axis, starting from the right of  the screen. If set to -1, the value is ignored and the value of the x key is used. If the value is greater than 0, then the value of the x key is ignored. This key is only relevant in un-expanded mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the orientation key.</_description>
-    </key>
-    <key name="y-bottom" type="i">
-      <default>-1</default>
-      <_summary>Y co-ordinate of panel, starting from the bottom of the screen</_summary>
-      <_description>The location of the panel along the y-axis, starting from the bottom of  the screen. If set to -1, the value is ignored and the value of the y key is used. If the value is greater than 0, then the value of the y key is ignored. This key is only relevant in un-expanded mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the orientation key.</_description>
-    </key>
-    <key name="x-centered" type="b">
-      <default>false</default>
-      <_summary>Center panel on x-axis</_summary>
-      <_description>If true, the x and x_right keys are ignored and the panel is placed at the center of the x-axis of the screen. If the panel is resized it will remain at that position - i.e. the panel will grow on both sides. If false, the x and x_right keys specify the location of the panel.</_description>
-    </key>
-    <key name="y-centered" type="b">
-      <default>false</default>
-      <_summary>Center panel on y-axis</_summary>
-      <_description>If true, the y and y_bottom keys are ignored and the panel is placed at the center of the y-axis of the screen. If the panel is resized it will remain at that position - i.e. the panel will grow on both sides. If false, the y and y_bottom keys specify the location of the panel.</_description>
-    </key>
-    <key name="auto-hide" type="b">
-      <default>false</default>
-      <_summary>Automatically hide panel into corner</_summary>
-      <_description>If true, the panel is automatically hidden into a corner of the screen when the pointer leaves the panel area. Moving the pointer to that corner again will cause the panel to re-appear.</_description>
-    </key>
-    <key name="enable-animations" type="b">
-      <default>true</default>
-      <_summary>Enable animations</_summary>
-      <_description>If true, hiding and un-hiding of this panel will be animated rather than happening instantly.</_description>
-    </key>
-    <key name="enable-buttons" type="b">
-      <default>false</default>
-      <_summary>Enable hide buttons</_summary>
-      <_description>If true, buttons will be placed on each side of the panel which may be used to move the panel to edge of the screen, leaving only a button showing.</_description>
-    </key>
-    <key name="enable-arrows" type="b">
-      <default>true</default>
-      <_summary>Enable arrows on hide buttons</_summary>
-      <_description>If true, arrows will be placed on the hide buttons. This key is only relevant if the enable_buttons key is true.</_description>
-    </key>
-    <key name="hide-delay" type="i">
-      <default>300</default>
-      <_summary>Panel autohide delay</_summary>
-      <_description>Specifies the number of milliseconds delay after the pointer leaves the panel area before the panel is automatically hidden. This key is only relevant if the auto_hide key is true.</_description>
-    </key>
-    <key name="unhide-delay" type="i">
-      <default>100</default>
-      <_summary>Panel autounhide delay</_summary>
-      <_description>Specifies the number of milliseconds delay after the pointer enters the panel area before the panel is automatically re-shown. This key is only relevant if the auto_hide key is true.</_description>
-    </key>
-    <key name="auto-hide-size" type="i">
-      <default>1</default>
-      <_summary>Visible pixels when hidden</_summary>
-      <_description>Specifies the number of pixels visible when the panel is automatically hidden into a corner. This key is only relevant if the auto_hide key is true.</_description>
-    </key>
-    <key name="animation-speed" enum="org.mate.panel.PanelAnimationSpeed">
-      <default>'fast'</default>
-      <_summary>Animation speed</_summary>
-      <_description>The speed in which panel animations should occur. Possible values are "slow", "medium" and "fast". This key is only relevant if the enable_animations key is true.</_description>
-    </key>
-    <child name="background" schema="org.mate.panel.toplevel.background"/>
-  </schema>
-  <schema id="org.mate.panel.toplevel.background">
-    <key name="type" enum="org.mate.panel.PanelBackgroundType">
-      <default>'none'</default>
-      <_summary>Background type</_summary>
-      <_description>Which type of background should be used for this panel. Possible values are "none" - the default GTK+ widget background will be used, "color" - the color key will be used as background color or "image" - the image specified by the image key will be used as background.</_description>
-    </key>
-    <key name="color" type="s">
-      <default>'#ffffff'</default>
-      <_summary>Background color</_summary>
-      <_description>Specifies the background color for the panel in #RGB format.</_description>
-    </key>
-    <key name="opacity" type="i">
-      <default>6000</default>
-      <_summary>Background color opacity</_summary>
-      <_description>Specifies the opacity of the background color format. If the color is not completely opaque (a value of less than 65535), the color will be composited onto the desktop background image.</_description>
-    </key>
-    <key name="image" type="s">
-      <default>''</default>
-      <_summary>Background image</_summary>
-      <_description>Specifies the file to be used for the background image. If the image contains an alpha channel it will be composited onto the desktop background image.</_description>
-    </key>
-    <key name="fit" type="b">
-      <default>false</default>
-      <_summary>Fit image to panel</_summary>
-      <_description>If true, the image will be scaled (retaining the aspect ratio of the image) to the panel height (if horizontal).</_description>
-    </key>
-    <key name="stretch" type="b">
-      <default>false</default>
-      <_summary>Stretch image to panel</_summary>
-      <_description>If true, the image will be scaled to the panel dimensions. The aspect ratio of the image will not be maintained.</_description>
-    </key>
-    <key name="rotate" type="b">
-      <default>false</default>
-      <_summary>Rotate image on vertical panels</_summary>
-      <_description>If true, the background image will be rotated when the panel is oriented vertically.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0c84bf7a..653d481b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,17 +7,17 @@ applets/clock/clock.c
 applets/clock/clock-location.c
 applets/clock/clock-location-tile.c
 applets/clock/clock-utils.c
-applets/clock/org.mate.panel.applet.clock.gschema.xml.in.in
+[type: gettext/gsettings]applets/clock/org.mate.panel.applet.clock.gschema.xml.in
 [type: gettext/ini]applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in
 applets/fish/fish.c
 [type: gettext/glade]applets/fish/fish.ui
-applets/fish/org.mate.panel.applet.fish.gschema.xml.in.in
+[type: gettext/gsettings]applets/fish/org.mate.panel.applet.fish.gschema.xml.in
 [type: gettext/ini]applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in
 applets/notification_area/main.c
 applets/notification_area/na-tray-manager.c
 [type: gettext/ini]applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in
-applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in
-applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in
+[type: gettext/gsettings]applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in
+[type: gettext/gsettings]applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in
 [type: gettext/ini]applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in
 applets/wncklet/showdesktop.c
 applets/wncklet/window-list.c
@@ -26,10 +26,10 @@ applets/wncklet/window-menu.c
 applets/wncklet/wncklet.c
 applets/wncklet/workspace-switcher.c
 [type: gettext/glade]applets/wncklet/workspace-switcher.ui
-data/org.mate.panel.gschema.xml.in.in
-data/org.mate.panel.menubar.gschema.xml.in.in
-data/org.mate.panel.object.gschema.xml.in.in
-data/org.mate.panel.toplevel.gschema.xml.in.in
+[type: gettext/gsettings]data/org.mate.panel.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.panel.menubar.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.panel.object.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.panel.toplevel.gschema.xml.in
 mate-panel/libegg/eggdesktopfile.c
 mate-panel/libegg/eggsmclient.c
 mate-panel/libpanel-util/panel-error.c