[gsettings-desktop-schemas] build: Use intltool to translate GSettings schema files directly



commit 83054806aa2d5c93c4f4a3f14886625489e4c65a
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Fri Dec 19 22:45:56 2014 +0000

    build: Use intltool to translate GSettings schema files directly
    
    Instead of using intltool’s XML rules, use its specific GSettings schema
    rules to simplify translation of the schema files.
    
    This bumps the intltool dependency to 0.50.1.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741795

 configure.ac                                       |    4 +-
 po/POTFILES.in                                     |   54 +++---
 schemas/Makefile.am                                |   65 ++++----
 ...gnome.desktop.a11y.applications.gschema.xml.in} |   12 +-
 ...in.in => org.gnome.desktop.a11y.gschema.xml.in} |    6 +-
 .../org.gnome.desktop.a11y.keyboard.gschema.xml.in |  104 +++++++++++
 ...g.gnome.desktop.a11y.keyboard.gschema.xml.in.in |  104 -----------
 ...rg.gnome.desktop.a11y.magnifier.gschema.xml.in} |  128 +++++++-------
 .../org.gnome.desktop.a11y.mouse.gschema.xml.in    |   60 +++++++
 .../org.gnome.desktop.a11y.mouse.gschema.xml.in.in |   60 -------
 .../org.gnome.desktop.app-folders.gschema.xml.in   |   44 +++++
 ...org.gnome.desktop.app-folders.gschema.xml.in.in |   44 -----
 ...=> org.gnome.desktop.background.gschema.xml.in} |   42 +++---
 ...n => org.gnome.desktop.datetime.gschema.xml.in} |    4 +-
 ...me.desktop.default-applications.gschema.xml.in} |   36 ++--
 ...org.gnome.desktop.input-sources.gschema.xml.in} |   30 ++--
 ... => org.gnome.desktop.interface.gschema.xml.in} |  180 ++++++++++----------
 ...n => org.gnome.desktop.lockdown.gschema.xml.in} |   54 +++---
 ...org.gnome.desktop.media-handling.gschema.xml.in |   34 ++++
 ....gnome.desktop.media-handling.gschema.xml.in.in |   34 ----
 ...org.gnome.desktop.notifications.gschema.xml.in} |   54 +++---
 ...> org.gnome.desktop.peripherals.gschema.xml.in} |   22 ++--
 schemas/org.gnome.desktop.privacy.gschema.xml.in   |   63 +++++++
 .../org.gnome.desktop.privacy.gschema.xml.in.in    |   63 -------
 ...> org.gnome.desktop.screensaver.gschema.xml.in} |   94 +++++-----
 ....gnome.desktop.search-providers.gschema.xml.in} |   28 ++--
 ...in => org.gnome.desktop.session.gschema.xml.in} |    4 +-
 ...n.in => org.gnome.desktop.sound.gschema.xml.in} |   12 +-
 ...g.gnome.desktop.thumbnail-cache.gschema.xml.in} |    4 +-
 ... org.gnome.desktop.thumbnailers.gschema.xml.in} |   14 +-
 ...rg.gnome.desktop.wm.keybindings.gschema.xml.in} |  176 ++++++++++----------
 ...rg.gnome.desktop.wm.preferences.gschema.xml.in} |  124 +++++++-------
 ...n.in => org.gnome.system.locale.gschema.xml.in} |    6 +-
 ...in => org.gnome.system.location.gschema.xml.in} |   12 +-
 ...in.in => org.gnome.system.proxy.gschema.xml.in} |   96 +++++-----
 35 files changed, 934 insertions(+), 937 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 42dd0fe..bd46c6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.53)
 AC_INIT([gsettings-desktop-schemas], [3.15.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas])
-AC_CONFIG_SRCDIR(schemas/org.gnome.desktop.default-applications.gschema.xml.in.in)
+AC_CONFIG_SRCDIR(schemas/org.gnome.desktop.default-applications.gschema.xml.in)
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])
@@ -20,7 +20,7 @@ GOBJECT_INTROSPECTION_CHECK([1.31.0])
 GETTEXT_PACKAGE=gsettings-desktop-schemas
 AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 AC_OUTPUT([
 Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f452421..ac0710c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,29 +1,29 @@
 # List of source files containing translatable strings.
 # Please keep this list in alphabetic order.
-schemas/org.gnome.desktop.a11y.applications.gschema.xml.in.in
-schemas/org.gnome.desktop.a11y.gschema.xml.in.in
-schemas/org.gnome.desktop.a11y.keyboard.gschema.xml.in.in
-schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in
-schemas/org.gnome.desktop.a11y.mouse.gschema.xml.in.in
-schemas/org.gnome.desktop.app-folders.gschema.xml.in.in
-schemas/org.gnome.desktop.background.gschema.xml.in.in
-schemas/org.gnome.desktop.datetime.gschema.xml.in.in
-schemas/org.gnome.desktop.default-applications.gschema.xml.in.in
-schemas/org.gnome.desktop.input-sources.gschema.xml.in.in
-schemas/org.gnome.desktop.interface.gschema.xml.in.in
-schemas/org.gnome.desktop.lockdown.gschema.xml.in.in
-schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
-schemas/org.gnome.desktop.notifications.gschema.xml.in.in
-schemas/org.gnome.desktop.peripherals.gschema.xml.in.in
-schemas/org.gnome.desktop.privacy.gschema.xml.in.in
-schemas/org.gnome.desktop.screensaver.gschema.xml.in.in
-schemas/org.gnome.desktop.search-providers.gschema.xml.in.in
-schemas/org.gnome.desktop.session.gschema.xml.in.in
-schemas/org.gnome.desktop.sound.gschema.xml.in.in
-schemas/org.gnome.desktop.thumbnail-cache.gschema.xml.in.in
-schemas/org.gnome.desktop.thumbnailers.gschema.xml.in.in
-schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in
-schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in
-schemas/org.gnome.system.locale.gschema.xml.in.in
-schemas/org.gnome.system.location.gschema.xml.in.in
-schemas/org.gnome.system.proxy.gschema.xml.in.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.a11y.applications.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.a11y.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.a11y.keyboard.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.a11y.mouse.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.app-folders.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.background.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.datetime.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.default-applications.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.input-sources.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.interface.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.lockdown.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.media-handling.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.notifications.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.peripherals.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.privacy.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.screensaver.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.search-providers.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.session.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.sound.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.thumbnail-cache.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.thumbnailers.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.desktop.wm.preferences.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.system.locale.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.system.location.gschema.xml.in
+[type: gettext/gsettings]schemas/org.gnome.system.proxy.gschema.xml.in
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 763f348..95024cd 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,41 +1,38 @@
-desktop_gschemas_in_in =                                               \
-       org.gnome.desktop.default-applications.gschema.xml.in.in        \
-       org.gnome.desktop.interface.gschema.xml.in.in                   \
-       org.gnome.desktop.lockdown.gschema.xml.in.in                    \
-       org.gnome.system.locale.gschema.xml.in.in                       \
-       org.gnome.system.location.gschema.xml.in.in                     \
-       org.gnome.system.proxy.gschema.xml.in.in                        \
-       org.gnome.desktop.sound.gschema.xml.in.in                       \
-       org.gnome.desktop.thumbnail-cache.gschema.xml.in.in             \
-       org.gnome.desktop.a11y.gschema.xml.in.in                        \
-       org.gnome.desktop.a11y.keyboard.gschema.xml.in.in               \
-       org.gnome.desktop.a11y.applications.gschema.xml.in.in           \
-       org.gnome.desktop.a11y.magnifier.gschema.xml.in.in              \
-       org.gnome.desktop.a11y.mouse.gschema.xml.in.in                  \
-       org.gnome.desktop.thumbnailers.gschema.xml.in.in                \
-       org.gnome.desktop.session.gschema.xml.in.in                     \
-       org.gnome.desktop.background.gschema.xml.in.in                  \
-       org.gnome.desktop.datetime.gschema.xml.in.in                    \
-       org.gnome.desktop.media-handling.gschema.xml.in.in              \
-       org.gnome.desktop.screensaver.gschema.xml.in.in                 \
-       org.gnome.desktop.search-providers.gschema.xml.in.in            \
-       org.gnome.desktop.wm.keybindings.gschema.xml.in.in              \
-       org.gnome.desktop.wm.preferences.gschema.xml.in.in              \
-       org.gnome.desktop.input-sources.gschema.xml.in.in               \
-       org.gnome.desktop.privacy.gschema.xml.in.in                     \
-       org.gnome.desktop.notifications.gschema.xml.in.in               \
-       org.gnome.desktop.app-folders.gschema.xml.in.in                 \
-       org.gnome.desktop.peripherals.gschema.xml.in.in
-
- INTLTOOL_XML_NOMERGE_RULE@
+desktop_gschemas_in =                                          \
+       org.gnome.desktop.default-applications.gschema.xml.in   \
+       org.gnome.desktop.interface.gschema.xml.in              \
+       org.gnome.desktop.lockdown.gschema.xml.in               \
+       org.gnome.system.locale.gschema.xml.in                  \
+       org.gnome.system.location.gschema.xml.in                \
+       org.gnome.system.proxy.gschema.xml.in                   \
+       org.gnome.desktop.sound.gschema.xml.in                  \
+       org.gnome.desktop.thumbnail-cache.gschema.xml.in        \
+       org.gnome.desktop.a11y.gschema.xml.in                   \
+       org.gnome.desktop.a11y.keyboard.gschema.xml.in          \
+       org.gnome.desktop.a11y.applications.gschema.xml.in      \
+       org.gnome.desktop.a11y.magnifier.gschema.xml.in         \
+       org.gnome.desktop.a11y.mouse.gschema.xml.in             \
+       org.gnome.desktop.thumbnailers.gschema.xml.in           \
+       org.gnome.desktop.session.gschema.xml.in                \
+       org.gnome.desktop.background.gschema.xml.in             \
+       org.gnome.desktop.datetime.gschema.xml.in               \
+       org.gnome.desktop.media-handling.gschema.xml.in         \
+       org.gnome.desktop.screensaver.gschema.xml.in            \
+       org.gnome.desktop.search-providers.gschema.xml.in       \
+       org.gnome.desktop.wm.keybindings.gschema.xml.in         \
+       org.gnome.desktop.wm.preferences.gschema.xml.in         \
+       org.gnome.desktop.input-sources.gschema.xml.in          \
+       org.gnome.desktop.privacy.gschema.xml.in                \
+       org.gnome.desktop.notifications.gschema.xml.in          \
+       org.gnome.desktop.app-folders.gschema.xml.in            \
+       org.gnome.desktop.peripherals.gschema.xml.in
 
 gsettings_ENUM_NAMESPACE = org.gnome.desktop
 gsettings_ENUM_FILES = $(top_srcdir)/headers/*.h
 
-desktop_gschemas_in = $(desktop_gschemas_in_in:.xml.in.in=.xml.in)
 gsettings_SCHEMAS = $(desktop_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^\ datadir\@^$(datadir)^g' -e 's^\ GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < 
$< > $@
 
 @GSETTINGS_RULES@
@@ -44,13 +41,13 @@ convertdir=$(datadir)/GConf/gsettings
 convert_DATA=gsettings-desktop-schemas.convert wm-schemas.convert
 
 EXTRA_DIST =                           \
-       $(desktop_gschemas_in_in)       \
+       $(desktop_gschemas_in)  \
        $(convert_DATA)
 
 CLEANFILES =                                   \
        $(gsettings__enum_file)                 \
        $(gsettings_SCHEMAS)                    \
-       $(desktop_gschemas_in)                  \
+       $(desktop_gschemas_in:.xml.in=.xml)     \
        *.gschema.valid
 
 -include $(top_srcdir)/git.mk
diff --git a/schemas/org.gnome.desktop.a11y.applications.gschema.xml.in.in 
b/schemas/org.gnome.desktop.a11y.applications.gschema.xml.in
similarity index 54%
rename from schemas/org.gnome.desktop.a11y.applications.gschema.xml.in.in
rename to schemas/org.gnome.desktop.a11y.applications.gschema.xml.in
index 9a26803..c85af3f 100644
--- a/schemas/org.gnome.desktop.a11y.applications.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.a11y.applications.gschema.xml.in
@@ -3,18 +3,18 @@
   <schema id="org.gnome.desktop.a11y.applications" path="/org/gnome/desktop/a11y/applications/">
     <key name="screen-keyboard-enabled" type="b">
       <default>false</default>
-      <_summary>On-screen keyboard</_summary>
-      <_description>Whether the on-screen keyboard is turned on.</_description>
+      <summary>On-screen keyboard</summary>
+      <description>Whether the on-screen keyboard is turned on.</description>
     </key>
     <key name="screen-magnifier-enabled" type="b">
       <default>false</default>
-      <_summary>Screen magnifier</_summary>
-      <_description>Whether the screen magnifier is turned on.</_description>
+      <summary>Screen magnifier</summary>
+      <description>Whether the screen magnifier is turned on.</description>
     </key>
     <key name="screen-reader-enabled" type="b">
       <default>false</default>
-      <_summary>Screen reader</_summary>
-      <_description>Whether the screen reader is turned on.</_description>
+      <summary>Screen reader</summary>
+      <description>Whether the screen reader is turned on.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.a11y.gschema.xml.in.in b/schemas/org.gnome.desktop.a11y.gschema.xml.in
similarity index 76%
rename from schemas/org.gnome.desktop.a11y.gschema.xml.in.in
rename to schemas/org.gnome.desktop.a11y.gschema.xml.in
index b589be8..cbe0714 100644
--- a/schemas/org.gnome.desktop.a11y.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.a11y.gschema.xml.in
@@ -3,11 +3,11 @@
   <schema id="org.gnome.desktop.a11y" path="/org/gnome/desktop/a11y/">
     <key name="always-show-universal-access-status" type="b">
       <default>false</default>
-      <_summary>Always show the Universal Access status icon</_summary>
-      <_description>
+      <summary>Always show the Universal Access status icon</summary>
+      <description>
         This key overrides the automatic hiding of the Universal
         Access status icon when no accessibility features are enabled.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.a11y.keyboard.gschema.xml.in 
b/schemas/org.gnome.desktop.a11y.keyboard.gschema.xml.in
new file mode 100644
index 0000000..f505284
--- /dev/null
+++ b/schemas/org.gnome.desktop.a11y.keyboard.gschema.xml.in
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.gnome.desktop.a11y.keyboard" path="/org/gnome/desktop/a11y/keyboard/">
+    <key name="enable" type="b">
+      <default>false</default>
+      <summary>Enable accessibility keyboard shortcuts</summary>
+    </key>
+    <key name="feature-state-change-beep" type="b">
+      <default>false</default>
+      <summary>Beep when a keyboard accessibility feature changes</summary>
+      <description>Whether to beep when a keyboard accessibility feature is enabled or 
disabled.</description>
+    </key>
+    <key name="timeout-enable" type="b">
+      <default>false</default>
+      <summary>Disable keyboard accessibility after a timeout</summary>
+      <description>Whether to disable keyboard accessibility after a timeout, useful for shared 
machines.</description>
+    </key>
+    <key name="disable-timeout" type="i">
+      <default>200</default>
+      <summary>Duration of the disabling timeout</summary>
+      <description>Duration of the timeout before disabling the keyboard accessibility.</description>
+    </key>
+    <key name="bouncekeys-enable" type="b">
+      <default>false</default>
+      <summary>Enable 'Bounce Keys'</summary>
+      <description>Whether the 'Bounce Keys' keyboard accessibility feature is turned on.</description>
+    </key>
+    <key name="bouncekeys-delay" type="i">
+      <default>300</default>
+      <summary>Minimum interval in milliseconds</summary>
+      <description>Ignore multiple presses of the same key within this many milliseconds.</description>
+    </key>
+    <key name="bouncekeys-beep-reject" type="b">
+      <default>false</default>
+      <summary>Beep when a key is rejected</summary>
+      <description>Whether to beep when a key is rejected.</description>
+    </key>
+    <key name="mousekeys-enable" type="b">
+      <default>false</default>
+      <summary>Enable 'Mouse Keys'</summary>
+      <description>Whether the 'Mouse Keys' accessibility feature is turned on.</description>
+    </key>
+    <key name="mousekeys-max-speed" type="i">
+      <default>10</default>
+      <summary>Pixels per seconds</summary>
+      <description>How many pixels per second to move at the maximum speed.</description>
+    </key>
+    <key name="mousekeys-accel-time" type="i">
+      <default>300</default>
+      <summary>How long to accelerate in milliseconds</summary>
+      <description>How many milliseconds it takes to go from 0 to maximum speed.</description>
+    </key>
+    <key name="mousekeys-init-delay" type="i">
+      <default>300</default>
+      <summary>Initial delay in milliseconds</summary>
+      <description>How many milliseconds to wait before mouse movement keys start to operate.</description>
+    </key>
+    <key name="slowkeys-enable" type="b">
+      <default>false</default>
+      <summary>Enable 'Slow Keys'</summary>
+      <description>Whether the 'Slow Keys' accessibility feature is turned on.</description>
+    </key>
+    <key name="slowkeys-delay" type="i">
+      <default>300</default>
+      <summary>Minimum interval in milliseconds</summary>
+      <description>Do not accept a key as being pressed unless held for this many milliseconds.</description>
+    </key>
+    <key name="slowkeys-beep-press" type="b">
+      <default>false</default>
+      <summary>Beep when a key is first pressed</summary>
+      <description>Whether to beep when a key is first pressed.</description>
+    </key>
+    <key name="slowkeys-beep-accept" type="b">
+      <default>false</default>
+      <summary>Beep when a key is accepted</summary>
+      <description>Whether to beep when a key is accepted.</description>
+    </key>
+    <key name="slowkeys-beep-reject" type="b">
+      <default>false</default>
+      <summary>Beep when a key is rejected</summary>
+      <description>Whether to beep when a key is rejected.</description>
+    </key>
+    <key name="stickykeys-enable" type="b">
+      <default>false</default>
+      <summary>Enable sticky keys</summary>
+      <description>Whether the sticky keys accessibility feature is turned on.</description>
+    </key>
+    <key name="stickykeys-two-key-off" type="b">
+      <default>false</default>
+      <summary>Disable when two keys are pressed at the same time</summary>
+      <description>Whether to disable sticky keys if two keys are pressed at the same time.</description>
+    </key>
+    <key name="stickykeys-modifier-beep" type="b">
+      <default>false</default>
+      <summary>Beep when a modifier is pressed.</summary>
+      <description>Whether to beep when a modifier key is pressed.</description>
+    </key>
+    <key name="togglekeys-enable" type="b">
+      <default>false</default>
+      <summary>Enable 'Toggle Keys'</summary>
+      <description>Whether the 'Toggle Keys' accessibility feature is turned on.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in 
b/schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in
similarity index 79%
rename from schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in
rename to schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in
index 573b64e..8ed7405 100644
--- a/schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in
@@ -5,8 +5,8 @@
           gettext-domain="@GETTEXT_PACKAGE@">
     <key name="mouse-tracking" enum="org.gnome.desktop.GDesktopMagnifierMouseTrackingMode">
       <default>'proportional'</default>
-      <_summary>Mouse Tracking Mode</_summary>
-      <_description>
+      <summary>Mouse Tracking Mode</summary>
+      <description>
         Determines the position of the magnified mouse image within the
         magnified view and how it reacts to system mouse movement. The values
         are
@@ -19,12 +19,12 @@
         is proportionally the same as the position of the system mouse on screen;
         - push: when the magnified mouse intersects a boundary of the zoom
         region, the contents are scrolled into view.
-      </_description>
+      </description>
     </key>
     <key name="focus-tracking" enum="org.gnome.desktop.GDesktopMagnifierFocusTrackingMode">
       <default>'proportional'</default>
-      <_summary>Focus Tracking Mode</_summary>
-      <_description>
+      <summary>Focus Tracking Mode</summary>
+      <description>
         Determines the position of the focused widget within magnified view.
 
         The values are:
@@ -39,12 +39,12 @@
 
         - push: when the magnified focus intersects a boundary of the zoom region, the contents are scrolled
           into view
-    </_description>
+    </description>
     </key>
     <key name="caret-tracking" enum="org.gnome.desktop.GDesktopMagnifierCaretTrackingMode">
       <default>'centered'</default>
-      <_summary>Caret Tracking Mode</_summary>
-      <_description>
+      <summary>Caret Tracking Mode</summary>
+      <description>
         Determines the position of the caret within magnified view. The values are:
 
       - none: no caret tracking
@@ -57,172 +57,172 @@
 
       - push: when the magnified caret intersects a boundary of the zoom region, the contents are scrolled 
into
         view
-      </_description>
+      </description>
     </key>
     <key name="screen-position" enum="org.gnome.desktop.GDesktopMagnifierScreenPosition">
       <default>'full-screen'</default>
-      <_summary>Screen position</_summary>
-      <_description>
+      <summary>Screen position</summary>
+      <description>
         The magnified view either fills the entire screen, or occupies the
         top-half, bottom-half, left-half, or right-half of the screen.
-      </_description>
+      </description>
     </key>
     <key name="mag-factor" type="d">
       <default>2.0</default>
       <range min="0.1" max="32.0"/>
-      <_summary>Magnification factor</_summary>
-      <_description>
+      <summary>Magnification factor</summary>
+      <description>
         The power of the magnification. A value of 1.0 means no magnification.
         A value of 2.0 doubles the size.
-      </_description>
+      </description>
     </key>
     <key name="lens-mode" type="b">
       <default>false</default>
-      <_summary>Enable lens mode</_summary>
-      <_description>
+      <summary>Enable lens mode</summary>
+      <description>
         Whether the magnified view should be centered over the location of
         the system mouse and move with it.
-      </_description>
+      </description>
     </key>
     <key name="scroll-at-edges" type="b">
       <default>false</default>
-      <_summary>
+      <summary>
         Scroll magnified contents beyond the edges of the desktop
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         For centered mouse tracking, when the system pointer is at or near the
         edge of the screen, the magnified contents continue to scroll such that
         the screen edge moves into the magnified view.
-      </_description>
+      </description>
     </key>
 
     <!-- Cross-hairs -->
     <key name="show-cross-hairs" type="b">
       <default>false</default>
-      <_summary>Show or hide crosshairs</_summary>
-      <_description>
+      <summary>Show or hide crosshairs</summary>
+      <description>
         Enables/disables display of crosshairs centered on the magnified
         mouse sprite.
-      </_description>
+      </description>
     </key>
     <key name="cross-hairs-thickness" type="i">
       <default>8</default>
-      <_summary>Thickness of the crosshairs in pixels</_summary>
-      <_description>
+      <summary>Thickness of the crosshairs in pixels</summary>
+      <description>
         Width in pixels of the vertical and horizontal lines that make up the crosshairs.
-      </_description>
+      </description>
     </key>
     <key name="cross-hairs-color" type="s">
       <default>'#ff0000'</default>
-      <_summary>Color of the crosshairs</_summary>
-      <_description>
+      <summary>Color of the crosshairs</summary>
+      <description>
         The color of the the vertical and horizontal lines that make up
         the crosshairs.
-      </_description>
+      </description>
     </key>
     <key name="cross-hairs-opacity" type="d">
       <default>0.66</default>
       <range min="0.0" max="1.0"/>
-      <_summary>Opacity of the crosshairs</_summary>
-      <_description>
+      <summary>Opacity of the crosshairs</summary>
+      <description>
         Determines the transparency of the crosshairs, from fully opaque
         to fully transparent.
-      </_description>
+      </description>
     </key>
     <key name="cross-hairs-length" type="i">
       <default>4096</default>
       <range min="20" max="4096"/>
-      <_summary>Length of the crosshairs in pixels</_summary>
-      <_description>
+      <summary>Length of the crosshairs in pixels</summary>
+      <description>
         Determines the length in pixels of the vertical and horizontal
         lines that make up the crosshairs.
-      </_description>
+      </description>
     </key>
     <key name="cross-hairs-clip" type="b">
       <default>false</default>
-      <_summary>Clip the crosshairs at the center</_summary>
-      <_description>
+      <summary>Clip the crosshairs at the center</summary>
+      <description>
         Determines whether the crosshairs intersect the magnified mouse sprite,
         or are clipped such that the ends of the horizontal and vertical lines
         surround the mouse image.
-      </_description>
+      </description>
     </key>
     <key name="invert-lightness" type="b">
       <default>false</default>
-      <_summary>Inverse lightness</_summary>
-      <_description>
+      <summary>Inverse lightness</summary>
+      <description>
         Determines whether the lightness values are inverted:  darker colors
         become lighter and vice versa, and white and black are interchanged.
-      </_description>
+      </description>
     </key>
     <key name="color-saturation" type="d">
       <default>1.0</default>
       <range min="0.0" max="1.0"/>
-      <_summary>Color Saturation</_summary>
-      <_description>
+      <summary>Color Saturation</summary>
+      <description>
         Represents a change to the color saturation, from 0.0 (grayscale)
         to 1.0 (full color).
-      </_description>
+      </description>
     </key>
     <key name="brightness-red" type="d">
       <default>0.0</default>
       <range min="-1.0" max="1.0"/>
-      <_summary>Change brightness of red</_summary>
-      <_description>
+      <summary>Change brightness of red</summary>
+      <description>
         Represents a change to the default brightness of the red component. Zero
         indicates no change, values less than zero indicate a decrease, and
         values greater than zero indicate an increase.
-      </_description>
+      </description>
     </key>
     <key name="brightness-green" type="d">
       <default>0.0</default>
       <range min="-1.0" max="1.0"/>
-      <_summary>Change brightness of green</_summary>
-      <_description>
+      <summary>Change brightness of green</summary>
+      <description>
         Represents a change to the default brightness for the green component.
         Zero indicates no change, values less than zero indicate a decrease, and
         values greater than zero indicate an increase.
-      </_description>
+      </description>
     </key>
     <key name="brightness-blue" type="d">
       <default>0.0</default>
       <range min="-1.0" max="1.0"/>
-      <_summary>Change brightness of blue</_summary>
-      <_description>
+      <summary>Change brightness of blue</summary>
+      <description>
         Represents a change to the default brightness for the blue component.
         Zero indicates no change, values less than zero indicate a decrease, and
         values greater than zero indicate an increase.
-      </_description>
+      </description>
     </key>
     <key name="contrast-red" type="d">
       <default>0.0</default>
       <range min="-1.0" max="1.0"/>
-      <_summary>Change contrast of red</_summary>
-      <_description>
+      <summary>Change contrast of red</summary>
+      <description>
         Represents a change to the default contrast of the red component.  Zero
         indicates no change in contrast, values less than zero indicate a
         decrease, and values greater than zero indicate an increase.
-      </_description>
+      </description>
     </key>
     <key name="contrast-green" type="d">
       <default>0.0</default>
       <range min="-1.0" max="1.0"/>
-      <_summary>Change contrast of green</_summary>
-      <_description>
+      <summary>Change contrast of green</summary>
+      <description>
         Represents a change to the default contrast of the green component.
         Zero indicates no change in contrast, values less than zero indicate a
         decrease, and values greater than zero indicate an increase.
-      </_description>
+      </description>
     </key>
     <key name="contrast-blue" type="d">
       <default>0.0</default>
       <range min="-1.0" max="1.0"/>
-      <_summary>Change contrast of blue</_summary>
-      <_description>
+      <summary>Change contrast of blue</summary>
+      <description>
         Represents a change to the default contrast of the blue component.  Zero
         indicates no change in contrast, values less than zero indicate a
         decrease, and values greater than zero indicate an increase.
-     </_description>
+     </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.a11y.mouse.gschema.xml.in 
b/schemas/org.gnome.desktop.a11y.mouse.gschema.xml.in
new file mode 100644
index 0000000..34510de
--- /dev/null
+++ b/schemas/org.gnome.desktop.a11y.mouse.gschema.xml.in
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.gnome.desktop.a11y.mouse" path="/org/gnome/desktop/a11y/mouse/">
+    <key name="dwell-time" type="d">
+      <default>1.20</default>
+      <summary>Dwell click time</summary>
+      <description>Time in seconds before a click is triggered.</description>
+    </key>
+    <key name="dwell-threshold" type="i">
+      <default>10</default>
+      <summary>Movement threshold</summary>
+      <description>Distance in pixels before movement will be recognized.</description>
+    </key>
+    <key name="dwell-gesture-single" enum="org.gnome.desktop.GDesktopMouseDwellDirection">
+      <default>'left'</default>
+      <summary>Gesture single click</summary>
+      <description>Direction to perform a single click ('left', 'right', 'up', 'down).</description>
+    </key>
+    <key name="dwell-gesture-double" enum="org.gnome.desktop.GDesktopMouseDwellDirection">
+      <default>'up'</default>
+      <summary>Gesture double click</summary>
+      <description>Direction to perform a double click ('left', 'right', 'up', 'down).</description>
+    </key>
+    <key name="dwell-gesture-drag" enum="org.gnome.desktop.GDesktopMouseDwellDirection">
+      <default>'down'</default>
+      <summary>Gesture drag click</summary>
+      <description>Direction to perform dragging ('left', 'right', 'up', 'down).</description>
+    </key>
+    <key name="dwell-gesture-secondary" enum="org.gnome.desktop.GDesktopMouseDwellDirection">
+      <default>'right'</default>
+      <summary>Gesture secondary click</summary>
+      <description>Direction to perform a secondary click ('left', 'right', 'up', 'down).</description>
+    </key>
+    <key name="dwell-mode" enum="org.gnome.desktop.GDesktopMouseDwellMode">
+      <default>'window'</default>
+      <summary>Dwell click mode</summary>
+      <description>The active dwell click mode. Possible values are 'window' and 'gesture'.</description>
+    </key>
+    <key name="click-type-window-visible" type="b">
+      <default>true</default>
+      <summary>Show click type window</summary>
+      <description>Show click type window.</description>
+    </key>
+    <key name="dwell-click-enabled" type="b">
+      <default>false</default>
+      <summary>Enable dwell clicks</summary>
+      <description>Enable dwell clicks.</description>
+    </key>
+    <key name="secondary-click-enabled" type="b">
+      <default>false</default>
+      <summary>Secondary click enabled</summary>
+      <description>Enable simulated secondary clicks</description>
+    </key>
+    <key name="secondary-click-time" type="d">
+      <default>1.20</default>
+      <summary>Secondary click time</summary>
+      <description>Time in seconds before a simulated secondary click is triggered.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.gnome.desktop.app-folders.gschema.xml.in 
b/schemas/org.gnome.desktop.app-folders.gschema.xml.in
new file mode 100644
index 0000000..549c01d
--- /dev/null
+++ b/schemas/org.gnome.desktop.app-folders.gschema.xml.in
@@ -0,0 +1,44 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.desktop.app-folders" path="/org/gnome/desktop/app-folders/">
+    <key name="folder-children" type="as">
+      <default>[]</default>
+      <summary>Folder children</summary>
+      <description>List of relative settings paths at which app-folders are
+        stored. Each folder uses the org.gnome.desktop.app-folders.folder
+        schema.</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.desktop.app-folders.folder">
+    <key name="name" type="s">
+      <default>''</default>
+      <summary>Folder name</summary>
+      <description>The name of the application folder.</description>
+    </key>
+    <key name="translate" type="b">
+      <default>false</default>
+      <summary>Translate the name</summary>
+      <description>Whether the name key is a filename to be looked up in
+      /usr/share/desktop-directories.</description>
+    </key>
+    <key name="apps" type="as">
+      <default>[]</default>
+      <summary>Applications</summary>
+      <description>The list of IDs of applications that are explicitly
+      included in this folder.</description>
+    </key>
+    <key name="categories" type="as">
+      <default>[]</default>
+      <summary>Categories</summary>
+      <description>A list of categories for which apps will be placed
+      into this folder by default, in addition to the apps that are
+      listed in the apps key.</description>
+    </key>
+    <key name="excluded-apps" type="as">
+      <default>[]</default>
+      <summary>Excluded applications</summary>
+      <description>A list of IDs of applications that are excluded
+      from this folder. This can be used to remove applications that
+      would otherwise be included by category.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.gnome.desktop.background.gschema.xml.in.in 
b/schemas/org.gnome.desktop.background.gschema.xml.in
similarity index 72%
rename from schemas/org.gnome.desktop.background.gschema.xml.in.in
rename to schemas/org.gnome.desktop.background.gschema.xml.in
index c22d97f..5fc79da 100644
--- a/schemas/org.gnome.desktop.background.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.background.gschema.xml.in
@@ -2,57 +2,57 @@
   <schema id="org.gnome.desktop.background" path="/org/gnome/desktop/background/">
     <key name="picture-options" enum="org.gnome.desktop.GDesktopBackgroundStyle">
       <default>'zoom'</default>
-      <_summary>Picture Options</_summary>
-      <_description>
+      <summary>Picture Options</summary>
+      <description>
         Determines how the image set by wallpaper_filename is rendered.
         Possible values are "none", "wallpaper", "centered", "scaled",
         "stretched", "zoom", "spanned".
-      </_description>
+      </description>
     </key>
     <key name="picture-uri" type="s">
       <default>'file://@datadir@/backgrounds/gnome/adwaita-timed.xml'</default>
-      <_summary>Picture URI</_summary>
-      <_description>
+      <summary>Picture URI</summary>
+      <description>
         URI to use for the background image. Note that the backend only supports
         local (file://) URIs.
-      </_description>
+      </description>
     </key>
     <key name="picture-opacity" type="i">
       <range min="0" max="100"/>
       <default>100</default>
-      <_summary>Picture Opacity</_summary>
-      <_description>
+      <summary>Picture Opacity</summary>
+      <description>
         Opacity with which to draw the background picture.
-      </_description>
+      </description>
     </key>
     <key name="primary-color" type="s">
       <default>'#023c88'</default>
-      <_summary>Primary Color</_summary>
-      <_description>
+      <summary>Primary Color</summary>
+      <description>
         Left or Top color when drawing gradients, or the solid color.
-      </_description>
+      </description>
     </key>
     <key name="secondary-color" type="s">
       <default>'#5789ca'</default>
-      <_summary>Secondary Color</_summary>
-      <_description>
+      <summary>Secondary Color</summary>
+      <description>
         Right or Bottom color when drawing gradients, not used for solid color.
-      </_description>
+      </description>
     </key>
     <key name="color-shading-type" enum="org.gnome.desktop.GDesktopBackgroundShading">
       <default>'solid'</default>
-      <_summary>Color Shading Type</_summary>
-      <_description>
+      <summary>Color Shading Type</summary>
+      <description>
         How to shade the background color. Possible values are "horizontal",
         "vertical", and "solid".
-      </_description>
+      </description>
     </key>
     <key name="show-desktop-icons" type="b">
       <default>false</default>
-      <_summary>Have file manager handle the desktop</_summary>
-      <_description>
+      <summary>Have file manager handle the desktop</summary>
+      <description>
         If set to true, then file manager will draw the icons on the desktop.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.datetime.gschema.xml.in.in 
b/schemas/org.gnome.desktop.datetime.gschema.xml.in
similarity index 59%
rename from schemas/org.gnome.desktop.datetime.gschema.xml.in.in
rename to schemas/org.gnome.desktop.datetime.gschema.xml.in
index f47b1ad..1c0fa4c 100644
--- a/schemas/org.gnome.desktop.datetime.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.datetime.gschema.xml.in
@@ -3,8 +3,8 @@
   <schema id="org.gnome.desktop.datetime" path="/org/gnome/desktop/datetime/">
     <key name="automatic-timezone" type="b">
       <default>false</default>
-      <_summary>Automatically update timezone</_summary>
-      <_description>Whether to automatically update the timezone using geolocation.</_description>
+      <summary>Automatically update timezone</summary>
+      <description>Whether to automatically update the timezone using geolocation.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.default-applications.gschema.xml.in.in 
b/schemas/org.gnome.desktop.default-applications.gschema.xml.in
similarity index 82%
rename from schemas/org.gnome.desktop.default-applications.gschema.xml.in.in
rename to schemas/org.gnome.desktop.default-applications.gschema.xml.in
index dcc5d53..5f52a13 100644
--- a/schemas/org.gnome.desktop.default-applications.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.default-applications.gschema.xml.in
@@ -10,63 +10,63 @@
   <schema id="org.gnome.desktop.default-applications.office.calendar" 
path="/org/gnome/desktop/applications/office/calendar/">
     <key name="exec" type="s">
       <default>'evolution -c calendar'</default>
-      <_summary>Default calendar</_summary>
-      <_description>
+      <summary>Default calendar</summary>
+      <description>
         Default calendar application
 
         DEPRECATED: This key is deprecated and ignored.
         The preferred calendar application is the application handling the text/calendar mime type.
-      </_description>
+      </description>
     </key>
     <key name="needs-term" type="b">
       <default>false</default>
-      <_summary>Calendar needs terminal</_summary>
-      <_description>
+      <summary>Calendar needs terminal</summary>
+      <description>
         Whether the default calendar application needs a terminal to run.
 
         DEPRECATED: This key is deprecated and ignored.
         The preferred calendar application is the application handling the text/calendar mime type,
         whether it needs a terminal is taken from its desktop file.
-      </_description>
+      </description>
     </key>
   </schema>
   <schema id="org.gnome.desktop.default-applications.office.tasks" 
path="/org/gnome/desktop/applications/office/tasks/">
     <key name="exec" type="s">
       <default>'evolution -c tasks'</default>
-      <_summary>Default tasks</_summary>
-      <_description>
+      <summary>Default tasks</summary>
+      <description>
         Default tasks application.
-      </_description>
+      </description>
     </key>
     <key name="needs-term" type="b">
       <default>false</default>
-      <_summary>Tasks needs terminal</_summary>
-      <_description>
+      <summary>Tasks needs terminal</summary>
+      <description>
         Whether the default tasks application needs a terminal to run.
-      </_description>
+      </description>
     </key>
   </schema>
   <schema id="org.gnome.desktop.default-applications.terminal" 
path="/org/gnome/desktop/applications/terminal/">
     <key name="exec" type="s">
       <default>'gnome-terminal'</default>
-      <_summary>Terminal application</_summary>
-      <_description>
+      <summary>Terminal application</summary>
+      <description>
         Terminal program to use when starting applications that require one.
 
         DEPRECATED: This key is deprecated and ignored.
         The default terminal is handled in GIO.
-      </_description>
+      </description>
     </key>
     <key name="exec-arg" type="s">
       <default>'-x'</default>
-      <_summary>Exec Arguments</_summary>
-      <_description>
+      <summary>Exec Arguments</summary>
+      <description>
         Argument used to execute programs in the terminal defined by the 
         'exec' key.
 
         DEPRECATED: This key is deprecated and ignored.
         The default terminal and how to invoke it is handled in GIO.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.input-sources.gschema.xml.in.in 
b/schemas/org.gnome.desktop.input-sources.gschema.xml.in
similarity index 76%
rename from schemas/org.gnome.desktop.input-sources.gschema.xml.in.in
rename to schemas/org.gnome.desktop.input-sources.gschema.xml.in
index 26583ef..c8732ef 100644
--- a/schemas/org.gnome.desktop.input-sources.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.input-sources.gschema.xml.in
@@ -3,18 +3,18 @@
           path="/org/gnome/desktop/input-sources/">
     <key name="current" type="u">
       <default>0</default>
-      <_summary>Current input source</_summary>
-      <_description>
+      <summary>Current input source</summary>
+      <description>
         The zero-based index into the input sources list specifying
         the current one in effect. The value is automatically capped
         to remain in the range [0, sources_length) as long as the
         sources list isn't empty.
-      </_description>
+      </description>
     </key>
     <key name="sources" type="a(ss)">
       <default>[]</default>
-      <_summary>List of input sources</_summary>
-      <_description>
+      <summary>List of input sources</summary>
+      <description>
         List of input source identifiers available. Each source is
         specified as a tuple of 2 strings. The first string is the
         type and can be one of 'xkb' or 'ibus'. For 'xkb' sources the
@@ -23,31 +23,31 @@
         string is the IBus engine name. An empty list means that the X
         server's current XKB layout and variant won't be touched and
         IBus won't be used.
-      </_description>
+      </description>
     </key>
     <key name="xkb-options" type="as">
       <default>[]</default>
-      <_summary>List of XKB options</_summary>
-      <_description>
+      <summary>List of XKB options</summary>
+      <description>
         List of XKB options. Each option is an XKB option string as
         defined by xkeyboard-config's rules files.
-      </_description>
+      </description>
     </key>
     <key name="show-all-sources" type="b">
       <default>false</default>
-      <_summary>Show all installed input sources</_summary>
-      <_description>
+      <summary>Show all installed input sources</summary>
+      <description>
         Makes all installed input sources available for choosing in
         System Settings.
-      </_description>
+      </description>
     </key>
     <key name="per-window" type="b">
       <default>false</default>
-      <_summary>Use different input sources for each window</_summary>
-      <_description>
+      <summary>Use different input sources for each window</summary>
+      <description>
         When enabled, input sources get attached to the currently
         focused window when activated.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in.in 
b/schemas/org.gnome.desktop.interface.gschema.xml.in
similarity index 60%
rename from schemas/org.gnome.desktop.interface.gschema.xml.in.in
rename to schemas/org.gnome.desktop.interface.gschema.xml.in
index 82c7984..cf310a9 100644
--- a/schemas/org.gnome.desktop.interface.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.interface.gschema.xml.in
@@ -2,223 +2,223 @@
   <schema id="org.gnome.desktop.interface" path="/org/gnome/desktop/interface/">
     <key name="toolkit-accessibility" type="b">
       <default>false</default>
-      <_summary>Enable Toolkit Accessibility</_summary>
-      <_description>
+      <summary>Enable Toolkit Accessibility</summary>
+      <description>
         Whether toolkits should load accessibility related modules.
-      </_description>
+      </description>
     </key>
     <key name="enable-animations" type="b">
       <default>true</default>
-      <_summary>Enable Animations</_summary>
-      <_description>
+      <summary>Enable Animations</summary>
+      <description>
         Whether animations should be displayed. Note: This is a global key,
         it changes the behaviour of the window manager, the panel etc.
-      </_description>
+      </description>
     </key>
     <key name="menus-have-tearoff" type="b">
       <default>false</default>
-      <_summary>Menus Have Tearoff</_summary>
-      <_description>
+      <summary>Menus Have Tearoff</summary>
+      <description>
         Whether menus should have a tearoff.
-      </_description>
+      </description>
     </key>
     <key name="can-change-accels" type="b">
       <default>false</default>
-      <_summary>Can Change Accels</_summary>
-      <_description>
+      <summary>Can Change Accels</summary>
+      <description>
         Whether the user can dynamically type a new accelerator when
         positioned over an active menuitem.
-      </_description>
+      </description>
     </key>
     <key name="toolbar-style" enum="org.gnome.desktop.GDesktopToolbarStyle">
       <default>'both-horiz'</default>
-      <_summary>Toolbar Style</_summary>
-      <_description>
+      <summary>Toolbar Style</summary>
+      <description>
         Toolbar Style. Valid values are "both", "both-horiz", "icons",
         and "text".
-      </_description>
+      </description>
     </key>
     <key name="menubar-detachable" type="b">
       <default>false</default>
-      <_summary>Menubar Detachable</_summary>
-      <_description>
+      <summary>Menubar Detachable</summary>
+      <description>
         Whether the user can detach menubars and move them around.
-      </_description>
+      </description>
     </key>
     <key name="toolbar-detachable" type="b">
       <default>false</default>
-      <_summary>Toolbar Detachable</_summary>
-      <_description>
+      <summary>Toolbar Detachable</summary>
+      <description>
         Whether the user can detach toolbars and move them around.
-      </_description>
+      </description>
     </key>
     <key name="toolbar-icons-size" enum="org.gnome.desktop.GDesktopToolbarIconSize">
       <default>'large'</default>
-      <_summary>Toolbar Icon Size</_summary>
-      <_description>
+      <summary>Toolbar Icon Size</summary>
+      <description>
         Size of icons in toolbars, either "small" or "large".
-      </_description>
+      </description>
     </key>
     <key name="cursor-blink" type="b">
       <default>true</default>
-      <_summary>Cursor Blink</_summary>
-      <_description>
+      <summary>Cursor Blink</summary>
+      <description>
         Whether the cursor should blink.
-      </_description>
+      </description>
     </key>
     <key name="cursor-blink-time" type="i">
       <range min="100" max="2500"/>
       <default>1200</default>
-      <_summary>Cursor Blink Time</_summary>
-      <_description>
+      <summary>Cursor Blink Time</summary>
+      <description>
         Length of the cursor blink cycle, in milliseconds.
-      </_description>
+      </description>
     </key>
     <key name="cursor-blink-timeout" type="i">
       <range min="1" max="2147483647"/>
       <default>10</default>
-      <_summary>Cursor Blink Timeout</_summary>
-      <_description>
+      <summary>Cursor Blink Timeout</summary>
+      <description>
         Time after which the cursor stops blinking, in seconds.
-      </_description>
+      </description>
     </key>
     <key name="icon-theme" type="s">
       <default>'Adwaita'</default>
-      <_summary>Icon Theme</_summary>
-      <_description>
+      <summary>Icon Theme</summary>
+      <description>
         Icon theme to use for the panel, nautilus etc.
-      </_description>
+      </description>
     </key>
     <key name="gtk-theme" type="s">
       <default>'Adwaita'</default>
-      <_summary>Gtk+ Theme</_summary>
-      <_description>
+      <summary>Gtk+ Theme</summary>
+      <description>
         Basename of the default theme used by gtk+.
-      </_description>
+      </description>
     </key>
     <key name="gtk-key-theme" type="s">
       <default>'Default'</default>
-      <_summary>Gtk+ Keybinding Theme</_summary>
-      <_description>
+      <summary>Gtk+ Keybinding Theme</summary>
+      <description>
         Basename of the default keybinding theme used by gtk+.
-      </_description>
+      </description>
     </key>
     <key name="font-name" type="s">
       <default>'Cantarell 11'</default>
-      <_summary>Default font</_summary>
-      <_description>
+      <summary>Default font</summary>
+      <description>
         Name of the default font used by gtk+.
-      </_description>
+      </description>
     </key>
     <key name="text-scaling-factor" type="d">
       <range min="0.5" max="3.0"/>
       <default>1.0</default>
-      <_summary>Text scaling factor</_summary>
-      <_description>
+      <summary>Text scaling factor</summary>
+      <description>
         Factor used to enlarge or reduce text display, without changing font size.
-      </_description>
+      </description>
     </key>
     <key name="scaling-factor" type="u">
       <default>0</default>
-      <_summary>Window scaling factor</_summary>
-      <_description>
+      <summary>Window scaling factor</summary>
+      <description>
         Integer factor used to scale windows by. For use on high-dpi screens.
         0 means pick automatically based on monitor.
-      </_description>
+      </description>
     </key>
     <key name="gtk-im-preedit-style" type="s">
       <default>'callback'</default>
-      <_summary>GTK IM Preedit Style</_summary>
-      <_description>
+      <summary>GTK IM Preedit Style</summary>
+      <description>
         Name of the GTK+ input method Preedit Style used by gtk+.
-      </_description>
+      </description>
     </key>
     <key name="gtk-im-status-style" type="s">
       <default>'callback'</default>
-      <_summary>GTK IM Status Style</_summary>
-      <_description>
+      <summary>GTK IM Status Style</summary>
+      <description>
         Name of the GTK+ input method Status Style used by gtk+.
-      </_description>
+      </description>
     </key>
     <key name="gtk-im-module" type="s">
       <default>''</default>
-      <_summary>GTK IM Module</_summary>
-      <_description>
+      <summary>GTK IM Module</summary>
+      <description>
         Name of the input method module used by GTK+.
-      </_description>
+      </description>
     </key>
     <key name="document-font-name" type="s">
       <default>'Sans 11'</default>
-      <_summary>Document font</_summary>
-      <_description>
+      <summary>Document font</summary>
+      <description>
         Name of the default font used for reading documents.
-      </_description>
+      </description>
     </key>
     <key name="monospace-font-name" type="s">
       <default>'Monospace 11'</default>
-      <_summary>Monospace font</_summary>
-      <_description>
+      <summary>Monospace font</summary>
+      <description>
         Name of a monospaced (fixed-width) font for use in locations like
         terminals.
-      </_description>
+      </description>
     </key>
     <key name="menubar-accel" type="s">
       <default>'F10'</default>
-      <_summary>Menubar accelerator</_summary>
-      <_description>
+      <summary>Menubar accelerator</summary>
+      <description>
         Keyboard shortcut to open the menu bars.
-      </_description>
+      </description>
     </key>
     <key name="cursor-theme" type="s">
       <default>'Adwaita'</default>
-      <_summary>Cursor theme</_summary>
-      <_description>Cursor theme name. Used only by Xservers that support the Xcursor 
extension.</_description>
+      <summary>Cursor theme</summary>
+      <description>Cursor theme name. Used only by Xservers that support the Xcursor extension.</description>
     </key>
     <key name="cursor-size" type="i">
       <default>24</default>
-      <_summary>Cursor size</_summary>
-      <_description>Size of the cursor used as cursor theme.</_description>
+      <summary>Cursor size</summary>
+      <description>Size of the cursor used as cursor theme.</description>
     </key>
     <key name="gtk-timeout-initial" type="i">
       <default>200</default>
-      <_summary>Timeout before click repeat</_summary>
-      <_description>Timeout in milliseconds before a click starts repeating (on spinner buttons for 
example).</_description>
+      <summary>Timeout before click repeat</summary>
+      <description>Timeout in milliseconds before a click starts repeating (on spinner buttons for 
example).</description>
     </key>
     <key name="gtk-timeout-repeat" type="i">
       <default>20</default>
-      <_summary>Timeout between click repeats</_summary>
-      <_description>Timeout in milliseconds between repeated clicks when a button is left 
pressed.</_description>
+      <summary>Timeout between click repeats</summary>
+      <description>Timeout in milliseconds between repeated clicks when a button is left 
pressed.</description>
     </key>
     <key name="gtk-color-palette" type="s">
       <default>'black:white:gray50:red:purple:blue:light 
blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light 
green:gray10:gray30:gray75:gray90'</default>
-      <_summary>Palette used in the color selector</_summary>
-      <_description>Palette used in the color selector as defined by the 'gtk-color-palette' 
setting</_description>
+      <summary>Palette used in the color selector</summary>
+      <description>Palette used in the color selector as defined by the 'gtk-color-palette' 
setting</description>
     </key>
     <key name="gtk-color-scheme" type="s">
       <default>''</default>
-      <_summary>List of symbolic names and color equivalents</_summary>
-      <_description>A '\n' separated list of "name:color" as defined by the 'gtk-color-scheme' 
setting</_description>
+      <summary>List of symbolic names and color equivalents</summary>
+      <description>A '\n' separated list of "name:color" as defined by the 'gtk-color-scheme' 
setting</description>
     </key>
     <key name="clock-format" enum="org.gnome.desktop.GDesktopClockFormat">
       <default>'24h'</default>
-      <_summary>Whether the clock displays in 24h or 12h format</_summary>
-      <_description>
+      <summary>Whether the clock displays in 24h or 12h format</summary>
+      <description>
         Whether the clock displays in 24h or 12h format
-      </_description>
+      </description>
     </key>
     <key name="clock-show-seconds" type="b">
       <default>false</default>
-      <_summary>Whether the clock shows seconds</_summary>
-      <_description>
+      <summary>Whether the clock shows seconds</summary>
+      <description>
        If true, display seconds in the clock.
-      </_description>
+      </description>
     </key>
     <key name="clock-show-date" type="b">
       <default>false</default>
-      <_summary>Show date in clock</_summary>
-      <_description>
+      <summary>Show date in clock</summary>
+      <description>
         If true, display date in the clock, in addition to time.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.lockdown.gschema.xml.in.in 
b/schemas/org.gnome.desktop.lockdown.gschema.xml.in
similarity index 70%
rename from schemas/org.gnome.desktop.lockdown.gschema.xml.in.in
rename to schemas/org.gnome.desktop.lockdown.gschema.xml.in
index eb3f433..9e29dfd 100644
--- a/schemas/org.gnome.desktop.lockdown.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.lockdown.gschema.xml.in
@@ -2,73 +2,73 @@
   <schema id="org.gnome.desktop.lockdown" path="/org/gnome/desktop/lockdown/">
     <key name="disable-command-line" type="b">
       <default>false</default>
-      <_summary>Disable command line</_summary>
-      <_description>
+      <summary>Disable command line</summary>
+      <description>
         Prevent the user from accessing the terminal or specifying a command 
         line to be executed. For example, this would disable access to the 
         panel's "Run Application" dialog.
-      </_description>
+      </description>
     </key>
     <key name="disable-save-to-disk" type="b">
       <default>false</default>
-      <_summary>Disable saving files to disk</_summary>
-      <_description>
+      <summary>Disable saving files to disk</summary>
+      <description>
         Prevent the user from saving files to disk. For example, this would 
         disable access to all applications' "Save as" dialogs.
-      </_description>
+      </description>
     </key>
     <key name="disable-printing" type="b">
       <default>false</default>
-      <_summary>Disable printing</_summary>
-      <_description>
+      <summary>Disable printing</summary>
+      <description>
         Prevent the user from printing. For example, this would disable access 
         to all applications' "Print" dialogs.
-      </_description>
+      </description>
     </key>
     <key name="disable-print-setup" type="b">
       <default>false</default>
-      <_summary>Disable print setup</_summary>
-      <_description>
+      <summary>Disable print setup</summary>
+      <description>
         Prevent the user from modifying print settings. For example, this would 
         disable access to all applications' "Print Setup" dialogs.
-      </_description>
+      </description>
     </key>
     <key name="disable-user-switching" type="b">
       <default>false</default>
-      <_summary>Disable user switching</_summary>
-      <_description>
+      <summary>Disable user switching</summary>
+      <description>
         Prevent the user from switching to another account while his session 
         is active.
-      </_description>
+      </description>
     </key>
     <key name="disable-lock-screen" type="b">
       <default>false</default>
-      <_summary>Disable lock screen</_summary>
-      <_description>
+      <summary>Disable lock screen</summary>
+      <description>
         Prevent the user to lock his screen.
-      </_description>
+      </description>
     </key>
     <key name="disable-application-handlers" type="b">
       <default>false</default>
-      <_summary>Disable URL and MIME type handlers</_summary>
-      <_description>
+      <summary>Disable URL and MIME type handlers</summary>
+      <description>
         Prevent running any URL or MIME type handler applications.
-      </_description>
+      </description>
     </key>
     <key name="disable-log-out" type="b">
       <default>false</default>
-      <_summary>Disable log out</_summary>
-      <_description>
+      <summary>Disable log out</summary>
+      <description>
         Prevent the user from logging out.
-      </_description>
+      </description>
     </key>
     <key name="user-administration-disabled" type="b">
       <default>false</default>
-      <_summary>Disable user administration</_summary>
-      <_description>
+      <summary>Disable user administration</summary>
+      <description>
         Stop the user from modifying user accounts. By default, we allow adding
         and removing users, as well as changing other users settings.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.media-handling.gschema.xml.in 
b/schemas/org.gnome.desktop.media-handling.gschema.xml.in
new file mode 100644
index 0000000..8e6f77a
--- /dev/null
+++ b/schemas/org.gnome.desktop.media-handling.gschema.xml.in
@@ -0,0 +1,34 @@
+<schemalist gettext-domain="gsettings-desktop-schemas">
+  <schema id="org.gnome.desktop.media-handling" path="/org/gnome/desktop/media-handling/">
+    <key name="automount" type="b">
+      <default>true</default>
+      <summary>Whether to automatically mount media</summary>
+      <description>If set to true, then Nautilus will automatically mount media such as user-visible hard 
disks and removable media on start-up and media insertion.</description>
+    </key>
+    <key name="automount-open" type="b">
+      <default>true</default>
+      <summary>Whether to automatically open a folder for automounted media</summary>
+      <description>If set to true, then Nautilus will automatically open a folder when media is automounted. 
This only applies to media where no known x-content/* type was detected; for media where a known x-content 
type is detected, the user configurable action will be taken instead.</description>
+    </key>
+    <key name="autorun-never" type="b">
+      <default>false</default>
+      <summary>Never prompt or autorun/autostart programs when media are inserted</summary>
+      <description>If set to true, then Nautilus will never prompt nor autorun/autostart programs when a 
medium is inserted.</description>
+    </key>
+    <key name="autorun-x-content-start-app" type="as">
+      <default>[ 'x-content/unix-software' ]</default>
+      <summary>List of x-content/* types where the preferred application will be launched</summary>
+      <description>List of x-content/* types for which the user have chosen to start an application in the 
preference capplet. The preferred application for the given type will be started on insertion on media 
matching these types.</description>
+    </key>
+    <key name="autorun-x-content-ignore" type="as">
+      <default>[]</default>
+      <summary>List of x-content/* types set to "Do Nothing"</summary>
+      <description>List of x-content/* types for which the user have chosen "Do Nothing" in the preference 
capplet. No prompt will be shown nor will any matching application be started on insertion of media matching 
these types.</description>
+    </key>
+    <key name="autorun-x-content-open-folder" type="as">
+      <default>[]</default>
+      <summary>List of x-content/* types set to "Open Folder"</summary>
+      <description>List of x-content/* types for which the user have chosen "Open Folder" in the preferences 
capplet. A folder window will be opened on insertion of media matching these types.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.gnome.desktop.notifications.gschema.xml.in.in 
b/schemas/org.gnome.desktop.notifications.gschema.xml.in
similarity index 69%
rename from schemas/org.gnome.desktop.notifications.gschema.xml.in.in
rename to schemas/org.gnome.desktop.notifications.gschema.xml.in
index 9af45b9..fe28eda 100644
--- a/schemas/org.gnome.desktop.notifications.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.notifications.gschema.xml.in
@@ -3,18 +3,18 @@
           gettext-domain="@GETTEXT_PACKAGE@">
     <key name="show-banners" type="b">
       <default>true</default>
-      <_summary>Show notification banners</_summary>
-      <_description>
+      <summary>Show notification banners</summary>
+      <description>
         Whether notification banners are visible for application notifications.
-      </_description>
+      </description>
     </key>
 
     <key name="show-in-lock-screen" type="b">
       <default>true</default>
-      <_summary>Show notifications in the lock screen</_summary>
-      <_description>
+      <summary>Show notifications in the lock screen</summary>
+      <description>
         Whether notifications are shown in the lock screen or not.
-      </_description>
+      </description>
     </key>
 
     <!-- Temporary hack until GSettingsList lands -->
@@ -28,60 +28,60 @@
   <schema id="org.gnome.desktop.notifications.application" gettext-domain="@GETTEXT_PACKAGE@">
     <key name="application-id" type="s">
       <default>''</default>
-      <_summary>Application ID</_summary>
-      <_description>
+      <summary>Application ID</summary>
+      <description>
         The application that this policy is for.
-      </_description>
+      </description>
     </key>
 
     <key name="enable" type="b">
       <default>true</default>
-      <_summary>Enable notifications</_summary>
-      <_description>
+      <summary>Enable notifications</summary>
+      <description>
         Whether notifications are globally enabled for this application.
-      </_description>
+      </description>
     </key>
 
     <key name="enable-sound-alerts" type="b">
       <default>true</default>
-      <_summary>Enable sound alerts</_summary>
-      <_description>
+      <summary>Enable sound alerts</summary>
+      <description>
         Whether notifications should be accompanied by sound alerts.
-      </_description>
+      </description>
     </key>
 
     <key name="show-banners" type="b">
       <default>true</default>
-      <_summary>Show notification banners</_summary>
-      <_description>
+      <summary>Show notification banners</summary>
+      <description>
         Whether notification banners for this application are shown or not. Does not
         affect clicking on message tray buttons.
-      </_description>
+      </description>
     </key>
 
     <key name="force-expanded" type="b">
       <default>false</default>
-      <_summary>Force automatic expanding of banners</_summary>
-      <_description>
+      <summary>Force automatic expanding of banners</summary>
+      <description>
         Whether notifications from this application are expanded automatically when in banner mode.
-      </_description>
+      </description>
     </key>
 
     <key name="show-in-lock-screen" type="b">
       <default>true</default>
-      <_summary>Show in the lock screen</_summary>
-      <_description>
+      <summary>Show in the lock screen</summary>
+      <description>
         Whether notifications from this application are shown when the screen is locked.
-      </_description>
+      </description>
     </key>
 
     <key name="details-in-lock-screen" type="b">
       <default>false</default>
-      <_summary>Show details in the lock screen</_summary>
-      <_description>
+      <summary>Show details in the lock screen</summary>
+      <description>
         Whether the summary and body of notifications from this application will be
         visible in the locked screen.
-      </_description>
+      </description>
     </key>
 
   </schema>
diff --git a/schemas/org.gnome.desktop.peripherals.gschema.xml.in.in 
b/schemas/org.gnome.desktop.peripherals.gschema.xml.in
similarity index 80%
rename from schemas/org.gnome.desktop.peripherals.gschema.xml.in.in
rename to schemas/org.gnome.desktop.peripherals.gschema.xml.in
index af38977..1e8e204 100644
--- a/schemas/org.gnome.desktop.peripherals.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.peripherals.gschema.xml.in
@@ -10,18 +10,18 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.touchpad" 
path="/org/gnome/desktop/peripherals/touchpad/">
     <key name="scroll-method" enum="org.gnome.desktop.GDesktopTouchpadScrollMethod">
       <default>'two-finger-scrolling'</default>
-      <_summary>Select the touchpad scroll method</_summary>
-      <_description>Select the touchpad scroll method. Supported values are: "disabled", "edge-scrolling", 
"two-finger-scrolling".</_description>
+      <summary>Select the touchpad scroll method</summary>
+      <description>Select the touchpad scroll method. Supported values are: "disabled", "edge-scrolling", 
"two-finger-scrolling".</description>
     </key>
     <key name="tap-to-click" type="b">
       <default>false</default>
-      <_summary>Enable mouse clicks with touchpad</_summary>
-      <_description>Set this to TRUE to be able to send mouse clicks by tapping on the 
touchpad.</_description>
+      <summary>Enable mouse clicks with touchpad</summary>
+      <description>Set this to TRUE to be able to send mouse clicks by tapping on the touchpad.</description>
     </key>
     <key name="send-events" enum="org.gnome.desktop.GDesktopDeviceSendEvents">
       <default>'enabled'</default>
-      <_summary>Touchpad enabled</_summary>
-      <_description>Defines the situations in which the touchpad is enabled.</_description>
+      <summary>Touchpad enabled</summary>
+      <description>Defines the situations in which the touchpad is enabled.</description>
     </key>
     <key name="left-handed" enum="org.gnome.desktop.GDesktopTouchpadHandedness">
       <default>'mouse'</default>
@@ -78,22 +78,22 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.tablet">
     <key name="display" type="as">
       <default>["", "", ""]</default>
-      <_summary>Drawing tablet mapping</_summary>
-      <_description>EDID information of the monitor the tablet is mapped to. Must be in the format [vendor, 
product, serial]. ["","",""] disables mapping.</_description>
+      <summary>Drawing tablet mapping</summary>
+      <description>EDID information of the monitor the tablet is mapped to. Must be in the format [vendor, 
product, serial]. ["","",""] disables mapping.</description>
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.touchscreen">
     <key name="display" type="as">
       <default>["", "", ""]</default>
-      <_summary>Touchscreen display mapping</_summary>
-      <_description>EDID information of the monitor the touchscreen is mapped to. Must be in the format 
[vendor, product, serial]. ["","",""] disables mapping.</_description>
+      <summary>Touchscreen display mapping</summary>
+      <description>EDID information of the monitor the touchscreen is mapped to. Must be in the format 
[vendor, product, serial]. ["","",""] disables mapping.</description>
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.trackball" 
path="/org/gnome/desktop/peripherals/trackball/">
     <key name="scroll-wheel-emulation-button" type="i">
       <default>0</default>
       <range min="0" max="24"/>
-      <_summary>Mouse wheel emulation button. 0 to disable the feature.</_summary>
+      <summary>Mouse wheel emulation button. 0 to disable the feature.</summary>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.privacy.gschema.xml.in 
b/schemas/org.gnome.desktop.privacy.gschema.xml.in
new file mode 100644
index 0000000..677ab87
--- /dev/null
+++ b/schemas/org.gnome.desktop.privacy.gschema.xml.in
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.gnome.desktop.privacy" path="/org/gnome/desktop/privacy/">
+    <key name="hide-identity" type="b">
+      <default>false</default>
+      <summary>Controls visibility of personal information</summary>
+      <description>If set to true, the system will make an effort to
+      not divulge the user's identity on screen or on the network.</description>
+    </key>
+    <key name="show-full-name-in-top-bar" type="b">
+      <default>true</default>
+      <summary>Show full name in the user menu</summary>
+      <description>Whether the users full name is shown in the user menu or not.</description>
+    </key>
+    <key name="remove-old-trash-files" type="b">
+      <default>false</default>
+      <summary>Whether to remove old files from the trash automatically</summary>
+      <description>If TRUE, automatically remove files from the trash
+      when they are older than 'old-files-age' days.</description>
+    </key>
+    <key name="remove-old-temp-files" type="b">
+      <default>false</default>
+      <summary>Whether to remove old temporary files automatically</summary>
+      <description>If TRUE, automatically remove temporary files
+      when they are older than 'old-files-age' days.</description>
+    </key>
+    <key name="old-files-age" type="u">
+      <default>30</default>
+      <summary>Number of days to keep trash and temporary files</summary>
+      <description>Consider trash and temporary files old after
+      this many days.</description>
+    </key>
+    <key name="remember-recent-files" type="b">
+      <default>true</default>
+      <summary>Whether to remember recently used files</summary>
+      <description>If FALSE, applications will not remember recently
+        used files.</description>
+    </key>
+    <key name="recent-files-max-age" type="i">
+      <default>-1</default>
+      <summary>Number of days to remember recently used files for</summary>
+      <description>Recently used files will be remembered for this many days.
+        If set to 0, recent files will not be remembered; if set to -1, they
+        will be retained indefinitively.</description>
+    </key>
+    <key name="remember-app-usage" type="b">
+      <default>true</default>
+      <summary>Whether to remember application usage</summary>
+      <description>If FALSE, application usage will not be monitored
+        and recorded.</description>
+    </key>
+    <key name="send-software-usage-stats" type="b">
+      <default>false</default>
+      <summary>Send statistics when applications are removed or installed</summary>
+      <description>If FALSE, no anonymous installation or removal information will be sent to the 
vendor.</description>
+    </key>
+    <key name="report-technical-problems" type="b">
+      <default>false</default>
+      <summary>Send reports of technical problems to the vendor</summary>
+      <description>If TRUE, anonymized reports will be sent automatically to the vendor.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/schemas/org.gnome.desktop.screensaver.gschema.xml.in.in 
b/schemas/org.gnome.desktop.screensaver.gschema.xml.in
similarity index 67%
rename from schemas/org.gnome.desktop.screensaver.gschema.xml.in.in
rename to schemas/org.gnome.desktop.screensaver.gschema.xml.in
index 7b142a8..86f21bd 100644
--- a/schemas/org.gnome.desktop.screensaver.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.screensaver.gschema.xml.in
@@ -2,134 +2,134 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.screensaver" 
path="/org/gnome/desktop/screensaver/">
     <key name="idle-activation-enabled" type="b">
       <default>true</default>
-      <_summary>Activate when idle</_summary>
-      <_description>
+      <summary>Activate when idle</summary>
+      <description>
         Set this to TRUE to activate the screensaver when the session is idle.
 
         DEPRECATED: This key is deprecated and ignored.
         Set org.gnome.desktop.session idle-delay to 0 if you do not want to activate the screensaver.
-      </_description>
+      </description>
     </key>
     <key name="lock-enabled" type="b">
       <default>true</default>
-      <_summary>Lock on activation</_summary>
-      <_description>Set this to TRUE to lock the screen when the screensaver goes active.</_description>
+      <summary>Lock on activation</summary>
+      <description>Set this to TRUE to lock the screen when the screensaver goes active.</description>
     </key>
     <key name="lock-delay" type="u">
       <default>0</default>
-      <_summary>Time before locking</_summary>
-      <_description>The number of seconds after screensaver activation before locking the 
screen.</_description>
+      <summary>Time before locking</summary>
+      <description>The number of seconds after screensaver activation before locking the 
screen.</description>
     </key>
     <key name="show-full-name-in-top-bar" type="b">
       <default>true</default>
-      <_summary>Show full name in the lock screen</_summary>
-      <_description>Whether the user's full name is shown in the lock screen or not. This only affects the 
screen shield, the name is always shown in the unlock dialog.</_description>
+      <summary>Show full name in the lock screen</summary>
+      <description>Whether the user's full name is shown in the lock screen or not. This only affects the 
screen shield, the name is always shown in the unlock dialog.</description>
     </key>
     <key name="embedded-keyboard-enabled" type="b">
       <default>false</default>
-      <_summary>Allow embedding a keyboard into the window</_summary>
-      <_description>
+      <summary>Allow embedding a keyboard into the window</summary>
+      <description>
         Set this to TRUE to allow embedding a keyboard into the window when trying to unlock.  The 
"keyboard_command" key must be set with the appropriate command.
 
         DEPRECATED: This key is deprecated and ignored.
-</_description>
+</description>
     </key>
     <key name="embedded-keyboard-command" type="s">
       <default>''</default>
-      <_summary>Embedded keyboard command</_summary>
-      <_description>
+      <summary>Embedded keyboard command</summary>
+      <description>
         The command that will be run, if the "embedded_keyboard_enabled" key is set to TRUE, to embed a 
keyboard widget into the window. This command should implement an XEMBED plug interface and output a window 
XID on the standard output.
 
         DEPRECATED: This key is deprecated and ignored.
-      </_description>
+      </description>
     </key>
     <key name="logout-enabled" type="b">
       <default>false</default>
-      <_summary>Allow logout</_summary>
-      <_description>
+      <summary>Allow logout</summary>
+      <description>
         Set this to TRUE to offer an option in the unlock dialog to allow logging out after a delay.  The 
delay is specified in the "logout_delay" key.
 
         DEPRECATED: This key is deprecated and ignored.
-      </_description>
+      </description>
     </key>
     <key name="logout-delay" type="u">
       <default>7200</default>
-      <_summary>Time before logout option</_summary>
-      <_description>
+      <summary>Time before logout option</summary>
+      <description>
         The number of seconds after the screensaver activation before a logout option will appear in the 
unlock dialog. This key has effect only if the "logout_enable" key is set to TRUE.
 
         DEPRECATED: This key is deprecated and ignored
-      </_description>
+      </description>
     </key>
     <key name="logout-command" type="s">
       <default>''</default>
-      <_summary>Logout command</_summary>
-      <_description>
+      <summary>Logout command</summary>
+      <description>
         The command to invoke when the logout button is clicked.  This command should simply log the user 
out without any interaction. This key has effect only if the "logout_enable" key is set to TRUE.
 
         DEPRECATED: This key is deprecated and ignored.
-      </_description>
+      </description>
     </key>
     <key name="user-switch-enabled" type="b">
       <default>true</default>
-      <_summary>Allow user switching</_summary>
-      <_description>Set this to TRUE to offer an option in the unlock dialog to switch to a different user 
account.</_description>
+      <summary>Allow user switching</summary>
+      <description>Set this to TRUE to offer an option in the unlock dialog to switch to a different user 
account.</description>
     </key>
     <key name="status-message-enabled" type="b">
       <default>true</default>
-      <_summary>Allow the session status message to be displayed</_summary>
-      <_description>
+      <summary>Allow the session status message to be displayed</summary>
+      <description>
         Allow the session status message to be displayed when the screen is locked.
 
         DEPRECATED: This key is deprecated and ignored.
-      </_description>
+      </description>
     </key>
     <key name="picture-options" enum="org.gnome.desktop.GDesktopBackgroundStyle">
       <default>'zoom'</default>
-      <_summary>Picture Options</_summary>
-      <_description>
+      <summary>Picture Options</summary>
+      <description>
         Determines how the image set by wallpaper_filename is rendered.
         Possible values are "none", "wallpaper", "centered", "scaled",
         "stretched", "zoom", "spanned".
-      </_description>
+      </description>
     </key>
     <key name="picture-uri" type="s">
       <default>'file://@datadir@/backgrounds/gnome/adwaita-lock.jpg'</default>
-      <_summary>Picture URI</_summary>
-      <_description>
+      <summary>Picture URI</summary>
+      <description>
         URI to use for the background image. Not that the backend only supports
         local (file://) URIs.
-      </_description>
+      </description>
     </key>
     <key name="picture-opacity" type="i">
       <range min="0" max="100"/>
       <default>100</default>
-      <_summary>Picture Opacity</_summary>
-      <_description>
+      <summary>Picture Opacity</summary>
+      <description>
         Opacity with which to draw the background picture.
-      </_description>
+      </description>
     </key>
     <key name="primary-color" type="s">
       <default>'#023c88'</default>
-      <_summary>Primary Color</_summary>
-      <_description>
+      <summary>Primary Color</summary>
+      <description>
         Left or Top color when drawing gradients, or the solid color.
-      </_description>
+      </description>
     </key>
     <key name="secondary-color" type="s">
       <default>'#5789ca'</default>
-      <_summary>Secondary Color</_summary>
-      <_description>
+      <summary>Secondary Color</summary>
+      <description>
         Right or Bottom color when drawing gradients, not used for solid color.
-      </_description>
+      </description>
     </key>
     <key name="color-shading-type" enum="org.gnome.desktop.GDesktopBackgroundShading">
       <default>'solid'</default>
-      <_summary>Color Shading Type</_summary>
-      <_description>
+      <summary>Color Shading Type</summary>
+      <description>
         How to shade the background color. Possible values are "horizontal",
         "vertical", and "solid".
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.search-providers.gschema.xml.in.in 
b/schemas/org.gnome.desktop.search-providers.gschema.xml.in
similarity index 78%
rename from schemas/org.gnome.desktop.search-providers.gschema.xml.in.in
rename to schemas/org.gnome.desktop.search-providers.gschema.xml.in
index 25c9681..1172987 100644
--- a/schemas/org.gnome.desktop.search-providers.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.search-providers.gschema.xml.in
@@ -4,48 +4,48 @@
 
     <key name="disable-external" type="b">
       <default>false</default>
-      <_summary>Disable all external search providers</_summary>
-      <_description>
+      <summary>Disable all external search providers</summary>
+      <description>
         Set to true to disable all external search provider programs,
         whether or not they are independently disabled or enabled.
         External search providers are installed by applications in
         $XDG_DATA_DIR/gnome-shell/search-providers.
-      </_description>
+      </description>
     </key>
 
     <key name="disabled" type="as">
       <default>[]</default>
-      <_summary>
+      <summary>
         List of desktop file IDs for which the associated default-enabled search provider
         should be disabled
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         Results for applications contained in this list will not be displayed
         when searching.
-      </_description>
+      </description>
     </key>
 
     <key name="enabled" type="as">
       <default>[]</default>
-      <_summary>
+      <summary>
         List of desktop file IDs for which the associated default-disabled search provider
         should be enabled
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         Results for applications contained in this list will be displayed
         when searching.
-      </_description>
+      </description>
     </key>
 
     <key name="sort-order" type="as">
       <default>['gnome-contacts.desktop', 'gnome-documents.desktop', 'nautilus.desktop']</default>
-      <_summary>List of desktop file IDs for search providers sort order</_summary>
-      <_description>
+      <summary>List of desktop file IDs for search providers sort order</summary>
+      <description>
         Results for applications contained in this list will be displayed in
         the specified order.
         Results for applications not specified in this list will be displayed
         last, sorted alphabetically.
-      </_description>
+      </description>
     </key>
 
   </schema>
diff --git a/schemas/org.gnome.desktop.session.gschema.xml.in.in 
b/schemas/org.gnome.desktop.session.gschema.xml.in
similarity index 71%
rename from schemas/org.gnome.desktop.session.gschema.xml.in.in
rename to schemas/org.gnome.desktop.session.gschema.xml.in
index e50c37f..8021e6f 100644
--- a/schemas/org.gnome.desktop.session.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.session.gschema.xml.in
@@ -2,8 +2,8 @@
   <schema id="org.gnome.desktop.session" path="/org/gnome/desktop/session/">
     <key name="idle-delay" type="u">
       <default>300</default>
-      <_summary>Time before session is considered idle</_summary>
-      <_description>The number of seconds of inactivity before the session is considered idle.</_description>
+      <summary>Time before session is considered idle</summary>
+      <description>The number of seconds of inactivity before the session is considered idle.</description>
     </key>
     <key name="session-name" type="s">
       <default>"gnome"</default>
diff --git a/schemas/org.gnome.desktop.sound.gschema.xml.in.in 
b/schemas/org.gnome.desktop.sound.gschema.xml.in
similarity index 51%
rename from schemas/org.gnome.desktop.sound.gschema.xml.in.in
rename to schemas/org.gnome.desktop.sound.gschema.xml.in
index 1e7f472..fe1b715 100644
--- a/schemas/org.gnome.desktop.sound.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.sound.gschema.xml.in
@@ -3,18 +3,18 @@
   <schema id="org.gnome.desktop.sound" path="/org/gnome/desktop/sound/">
     <key name="event-sounds" type="b">
       <default>true</default>
-      <_summary>Sounds for events</_summary>
-      <_description>Whether to play sounds on user events.</_description>
+      <summary>Sounds for events</summary>
+      <description>Whether to play sounds on user events.</description>
     </key>
     <key name="theme-name" type="s">
       <default>'freedesktop'</default>
-      <_summary>Sound theme name</_summary>
-      <_description>The XDG sound theme to use for event sounds.</_description>
+      <summary>Sound theme name</summary>
+      <description>The XDG sound theme to use for event sounds.</description>
     </key>
     <key name="input-feedback-sounds" type="b">
       <default>false</default>
-      <_summary>Input feedback sounds</_summary>
-      <_description>Whether to play sounds on input events.</_description>
+      <summary>Input feedback sounds</summary>
+      <description>Whether to play sounds on input events.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.thumbnail-cache.gschema.xml.in.in 
b/schemas/org.gnome.desktop.thumbnail-cache.gschema.xml.in
similarity index 57%
rename from schemas/org.gnome.desktop.thumbnail-cache.gschema.xml.in.in
rename to schemas/org.gnome.desktop.thumbnail-cache.gschema.xml.in
index cb5154e..2812c36 100644
--- a/schemas/org.gnome.desktop.thumbnail-cache.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.thumbnail-cache.gschema.xml.in
@@ -3,11 +3,11 @@
   <schema id="org.gnome.desktop.thumbnail-cache" path="/org/gnome/desktop/thumbnail-cache/">
     <key name="maximum-age" type="i">
       <default>180</default>
-      <_description>Maximum age for thumbnails in the cache, in days. Set to -1 to disable 
cleaning.</_description>
+      <description>Maximum age for thumbnails in the cache, in days. Set to -1 to disable 
cleaning.</description>
     </key>
     <key name="maximum-size" type="i">
       <default>512</default>
-      <_description>Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable 
cleaning.</_description>
+      <description>Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable 
cleaning.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.thumbnailers.gschema.xml.in.in 
b/schemas/org.gnome.desktop.thumbnailers.gschema.xml.in
similarity index 77%
rename from schemas/org.gnome.desktop.thumbnailers.gschema.xml.in.in
rename to schemas/org.gnome.desktop.thumbnailers.gschema.xml.in
index 1e6382c..355bb36 100644
--- a/schemas/org.gnome.desktop.thumbnailers.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.thumbnailers.gschema.xml.in
@@ -3,23 +3,23 @@
   <schema id="org.gnome.desktop.thumbnailers" path="/org/gnome/desktop/thumbnailers/">
     <key name="disable-all" type="b">
       <default>false</default>
-      <_summary>Disable all external thumbnailers</_summary>
-      <_description>
+      <summary>Disable all external thumbnailers</summary>
+      <description>
         Set to true to disable all external thumbnailer programs,
         independent on whether they are independently disabled/enabled.
-      </_description>
+      </description>
     </key>
 
     <key name="disable" type="as">
       <default>[]</default>
-      <_summary>
+      <summary>
         List of mime-types for which external thumbnailer
         programs will be disabled
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         Thumbnails will not be created for files whose mime-type is
         contained in the list.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in 
b/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in
similarity index 64%
rename from schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in
rename to schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in
index 70dbba7..bf430df 100644
--- a/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in
@@ -5,346 +5,346 @@
           gettext-domain="@GETTEXT_PACKAGE@">
     <key name="switch-to-workspace-1" type="as">
       <default><![CDATA[['<Super>Home']]]></default>
-      <_summary>Switch to workspace 1</_summary>
+      <summary>Switch to workspace 1</summary>
     </key>
     <key name="switch-to-workspace-2" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 2</_summary>
+      <summary>Switch to workspace 2</summary>
     </key>
     <key name="switch-to-workspace-3" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 3</_summary>
+      <summary>Switch to workspace 3</summary>
     </key>
     <key name="switch-to-workspace-4" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 4</_summary>
+      <summary>Switch to workspace 4</summary>
     </key>
     <key name="switch-to-workspace-5" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 5</_summary>
+      <summary>Switch to workspace 5</summary>
     </key>
     <key name="switch-to-workspace-6" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 6</_summary>
+      <summary>Switch to workspace 6</summary>
     </key>
     <key name="switch-to-workspace-7" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 7</_summary>
+      <summary>Switch to workspace 7</summary>
     </key>
     <key name="switch-to-workspace-8" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 8</_summary>
+      <summary>Switch to workspace 8</summary>
     </key>
     <key name="switch-to-workspace-9" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 9</_summary>
+      <summary>Switch to workspace 9</summary>
     </key>
     <key name="switch-to-workspace-10" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 10</_summary>
+      <summary>Switch to workspace 10</summary>
     </key>
     <key name="switch-to-workspace-11" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 11</_summary>
+      <summary>Switch to workspace 11</summary>
     </key>
     <key name="switch-to-workspace-12" type="as">
       <default>[]</default>
-      <_summary>Switch to workspace 12</_summary>
+      <summary>Switch to workspace 12</summary>
     </key>
     <key name="switch-to-workspace-left" type="as">
       <default><![CDATA[['<Control><Alt>Left']]]></default>
-      <_summary>Switch to workspace left</_summary>
+      <summary>Switch to workspace left</summary>
     </key>
     <key name="switch-to-workspace-right" type="as">
       <default><![CDATA[['<Control><Alt>Right']]]></default>
-      <_summary>Switch to workspace right</_summary>
+      <summary>Switch to workspace right</summary>
     </key>
     <key name="switch-to-workspace-up" type="as">
       <default><![CDATA[['<Super>Page_Up','<Control><Alt>Up']]]></default>
-      <_summary>Switch to workspace above</_summary>
+      <summary>Switch to workspace above</summary>
     </key>
     <key name="switch-to-workspace-down" type="as">
       <default><![CDATA[['<Super>Page_Down','<Control><Alt>Down']]]></default>
-      <_summary>Switch to workspace below</_summary>
+      <summary>Switch to workspace below</summary>
     </key>
     <key name="switch-to-workspace-last" type="as">
       <default><![CDATA[['<Super>End']]]></default>
-      <_summary>Switch to last workspace</_summary>
+      <summary>Switch to last workspace</summary>
     </key>
     <key name="switch-group" type="as">
       <default><![CDATA[['<Super>Above_Tab','<Alt>Above_Tab']]]></default>
-      <_summary>Switch windows of an application</_summary>
+      <summary>Switch windows of an application</summary>
     </key>
     <key name="switch-group-backward" type="as">
       <default><![CDATA[['<Shift><Super>Above_Tab','<Shift><Alt>Above_Tab']]]></default>
-      <_summary>Reverse switch windows of an application</_summary>
+      <summary>Reverse switch windows of an application</summary>
     </key>
     <key name="switch-applications" type="as">
       <default><![CDATA[['<Super>Tab','<Alt>Tab']]]></default>
-      <_summary>Switch applications</_summary>
+      <summary>Switch applications</summary>
     </key>
     <key name="switch-applications-backward" type="as">
       <default><![CDATA[['<Shift><Super>Tab','<Shift><Alt>Tab']]]></default>
-      <_summary>Reverse switch applications</_summary>
+      <summary>Reverse switch applications</summary>
     </key>
     <key name="switch-windows" type="as">
       <default>[]</default>
-      <_summary>Switch windows</_summary>
+      <summary>Switch windows</summary>
     </key>
     <key name="switch-windows-backward" type="as">
       <default>[]</default>
-      <_summary>Reverse switch windows</_summary>
+      <summary>Reverse switch windows</summary>
     </key>
     <key name="switch-panels" type="as">
       <default><![CDATA[['<Control><Alt>Tab']]]></default>
-      <_summary>Switch system controls</_summary>
+      <summary>Switch system controls</summary>
     </key>
     <key name="switch-panels-backward" type="as">
       <default><![CDATA[['<Shift><Control><Alt>Tab']]]></default>
-      <_summary>Reverse switch system controls</_summary>
+      <summary>Reverse switch system controls</summary>
     </key>
     <key name="cycle-group" type="as">
       <default><![CDATA[['<Alt>F6']]]></default>
-      <_summary>Switch windows of an app directly</_summary>
+      <summary>Switch windows of an app directly</summary>
     </key>
     <key name="cycle-group-backward" type="as">
       <default><![CDATA[['<Shift><Alt>F6']]]></default>
-      <_summary>Reverse switch windows of an app directly</_summary>
+      <summary>Reverse switch windows of an app directly</summary>
     </key>
     <key name="cycle-windows" type="as">
       <default><![CDATA[['<Alt>Escape']]]></default>
-      <_summary>Switch windows directly</_summary>
+      <summary>Switch windows directly</summary>
     </key>
     <key name="cycle-windows-backward" type="as">
       <default><![CDATA[['<Shift><Alt>Escape']]]></default>
-      <_summary>Reverse switch windows directly</_summary>
+      <summary>Reverse switch windows directly</summary>
     </key>
     <key name="cycle-panels" type="as">
       <default><![CDATA[['<Control><Alt>Escape']]]></default>
-      <_summary>Switch system controls directly</_summary>
+      <summary>Switch system controls directly</summary>
     </key>
     <key name="cycle-panels-backward" type="as">
       <default><![CDATA[['<Shift><Control><Alt>Escape']]]></default>
-      <_summary>Reverse switch system controls directly</_summary>
+      <summary>Reverse switch system controls directly</summary>
     </key>
     <key name="show-desktop" type="as">
       <default>[]</default>
-      <_summary>Hide all normal windows</_summary>
+      <summary>Hide all normal windows</summary>
     </key>
     <key name="panel-main-menu" type="as">
       <default><![CDATA[['<Super>s','<Alt>F1']]]></default>
-      <_summary>Show the activities overview</_summary>
+      <summary>Show the activities overview</summary>
     </key>
     <key name="panel-run-dialog" type="as">
       <default><![CDATA[['<Alt>F2']]]></default>
-      <_summary>Show the run command prompt</_summary>
+      <summary>Show the run command prompt</summary>
     </key>
     <key name="set-spew-mark" type="as">
       <default>[]</default>
-      <_summary>Don't use</_summary>
+      <summary>Don't use</summary>
     </key>
     <key name="activate-window-menu" type="as">
       <default><![CDATA[['<Alt>space']]]></default>
-      <_summary>Activate the window menu</_summary>
+      <summary>Activate the window menu</summary>
     </key>
     <key name="toggle-fullscreen" type="as">
       <default>[]</default>
-      <_summary>Toggle fullscreen mode</_summary>
+      <summary>Toggle fullscreen mode</summary>
     </key>
     <key name="toggle-maximized" type="as">
       <default><![CDATA[['<Alt>F10']]]></default>
-      <_summary>Toggle maximization state</_summary>
+      <summary>Toggle maximization state</summary>
     </key>
     <key name="toggle-above" type="as">
       <default>[]</default>
-      <_summary>Toggle window always appearing on top</_summary>
+      <summary>Toggle window always appearing on top</summary>
     </key>
     <key name="maximize" type="as">
       <default><![CDATA[['<Super>Up']]]></default>
-      <_summary>Maximize window</_summary>
+      <summary>Maximize window</summary>
     </key>
     <key name="unmaximize" type="as">
       <default><![CDATA[['<Super>Down','<Alt>F5']]]></default>
-      <_summary>Restore window</_summary>
+      <summary>Restore window</summary>
     </key>
     <key name="toggle-shaded" type="as">
       <default>[]</default>
-      <_summary>Toggle shaded state</_summary>
+      <summary>Toggle shaded state</summary>
     </key>
     <key name="minimize" type="as">
       <default><![CDATA[['<Super>h']]]></default>
-      <_summary>Minimize window</_summary>
+      <summary>Minimize window</summary>
     </key>
     <key name="close" type="as">
       <default><![CDATA[['<Alt>F4']]]></default>
-      <_summary>Close window</_summary>
+      <summary>Close window</summary>
     </key>
     <key name="begin-move" type="as">
       <default><![CDATA[['<Alt>F7']]]></default>
-      <_summary>Move window</_summary>
+      <summary>Move window</summary>
     </key>
     <key name="begin-resize" type="as">
       <default><![CDATA[['<Alt>F8']]]></default>
-      <_summary>Resize window</_summary>
+      <summary>Resize window</summary>
     </key>
     <key name="toggle-on-all-workspaces" type="as">
       <default>[]</default>
-      <_summary>Toggle window on all workspaces or one</_summary>
+      <summary>Toggle window on all workspaces or one</summary>
     </key>
     <key name="move-to-workspace-1" type="as">
       <default><![CDATA[['<Super><Shift>Home']]]></default>
-      <_summary>Move window to workspace 1</_summary>
+      <summary>Move window to workspace 1</summary>
     </key>
     <key name="move-to-workspace-2" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 2</_summary>
+      <summary>Move window to workspace 2</summary>
     </key>
     <key name="move-to-workspace-3" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 3</_summary>
+      <summary>Move window to workspace 3</summary>
     </key>
     <key name="move-to-workspace-4" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 4</_summary>
+      <summary>Move window to workspace 4</summary>
     </key>
     <key name="move-to-workspace-5" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 5</_summary>
+      <summary>Move window to workspace 5</summary>
     </key>
     <key name="move-to-workspace-6" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 6</_summary>
+      <summary>Move window to workspace 6</summary>
     </key>
     <key name="move-to-workspace-7" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 7</_summary>
+      <summary>Move window to workspace 7</summary>
     </key>
     <key name="move-to-workspace-8" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 8</_summary>
+      <summary>Move window to workspace 8</summary>
     </key>
     <key name="move-to-workspace-9" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 9</_summary>
+      <summary>Move window to workspace 9</summary>
     </key>
     <key name="move-to-workspace-10" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 10</_summary>
+      <summary>Move window to workspace 10</summary>
     </key>
     <key name="move-to-workspace-11" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 11</_summary>
+      <summary>Move window to workspace 11</summary>
     </key>
     <key name="move-to-workspace-12" type="as">
       <default>[]</default>
-      <_summary>Move window to workspace 12</_summary>
+      <summary>Move window to workspace 12</summary>
     </key>
     <key name="move-to-workspace-last" type="as">
       <default><![CDATA[['<Super><Shift>End']]]></default>
-      <_summary>Move window to last workspace</_summary>
+      <summary>Move window to last workspace</summary>
     </key>
     <key name="move-to-workspace-left" type="as">
       <default><![CDATA[['<Control><Shift><Alt>Left']]]></default>
-      <_summary>Move window one workspace to the left</_summary>
+      <summary>Move window one workspace to the left</summary>
     </key>
     <key name="move-to-workspace-right" type="as">
       <default><![CDATA[['<Control><Shift><Alt>Right']]]></default>
-      <_summary>Move window one workspace to the right</_summary>
+      <summary>Move window one workspace to the right</summary>
     </key>
     <key name="move-to-workspace-up" type="as">
       <default><![CDATA[['<Super><Shift>Page_Up','<Control><Shift><Alt>Up']]]></default>
-      <_summary>Move window one workspace up</_summary>
+      <summary>Move window one workspace up</summary>
     </key>
     <key name="move-to-workspace-down" type="as">
       <default><![CDATA[['<Super><Shift>Page_Down','<Control><Shift><Alt>Down']]]></default>
-      <_summary>Move window one workspace down</_summary>
+      <summary>Move window one workspace down</summary>
     </key>
     <key name="move-to-monitor-left" type="as">
       <default><![CDATA[['<Super><Shift>Left']]]></default>
-      <_summary>Move window to the next monitor on the left</_summary>
+      <summary>Move window to the next monitor on the left</summary>
     </key>
     <key name="move-to-monitor-right" type="as">
       <default><![CDATA[['<Super><Shift>Right']]]></default>
-      <_summary>Move window to the next monitor on the right</_summary>
+      <summary>Move window to the next monitor on the right</summary>
     </key>
     <key name="move-to-monitor-up" type="as">
       <default><![CDATA[['<Super><Shift>Up']]]></default>
-      <_summary>Move window to the next monitor above</_summary>
+      <summary>Move window to the next monitor above</summary>
     </key>
     <key name="move-to-monitor-down" type="as">
       <default><![CDATA[['<Super><Shift>Down']]]></default>
-      <_summary>Move window to the next monitor below</_summary>
+      <summary>Move window to the next monitor below</summary>
     </key>
     <key name="raise-or-lower" type="as">
       <default>[]</default>
-      <_summary>Raise window if covered, otherwise lower it</_summary>
+      <summary>Raise window if covered, otherwise lower it</summary>
     </key>
     <key name="raise" type="as">
       <default>[]</default>
-      <_summary>Raise window above other windows</_summary>
+      <summary>Raise window above other windows</summary>
     </key>
     <key name="lower" type="as">
       <default>[]</default>
-      <_summary>Lower window below other windows</_summary>
+      <summary>Lower window below other windows</summary>
     </key>
     <key name="maximize-vertically" type="as">
       <default>[]</default>
-      <_summary>Maximize window vertically</_summary>
+      <summary>Maximize window vertically</summary>
     </key>
     <key name="maximize-horizontally" type="as">
       <default>[]</default>
-      <_summary>Maximize window horizontally</_summary>
+      <summary>Maximize window horizontally</summary>
     </key>
     <key name="move-to-corner-nw" type="as">
       <default>[]</default>
-      <_summary>Move window to top left corner</_summary>
+      <summary>Move window to top left corner</summary>
     </key>
     <key name="move-to-corner-ne" type="as">
       <default>[]</default>
-      <_summary>Move window to top right corner</_summary>
+      <summary>Move window to top right corner</summary>
     </key>
     <key name="move-to-corner-sw" type="as">
       <default>[]</default>
-      <_summary>Move window to bottom left corner</_summary>
+      <summary>Move window to bottom left corner</summary>
     </key>
     <key name="move-to-corner-se" type="as">
       <default>[]</default>
-      <_summary>Move window to bottom right corner</_summary>
+      <summary>Move window to bottom right corner</summary>
     </key>
     <key name="move-to-side-n" type="as">
       <default>[]</default>
-      <_summary>Move window to top edge of screen</_summary>
+      <summary>Move window to top edge of screen</summary>
     </key>
     <key name="move-to-side-s" type="as">
       <default>[]</default>
-      <_summary>Move window to bottom edge of screen</_summary>
+      <summary>Move window to bottom edge of screen</summary>
     </key>
     <key name="move-to-side-e" type="as">
       <default>[]</default>
-      <_summary>Move window to right side of screen</_summary>
+      <summary>Move window to right side of screen</summary>
     </key>
     <key name="move-to-side-w" type="as">
       <default>[]</default>
-      <_summary>Move window to left side of screen</_summary>
+      <summary>Move window to left side of screen</summary>
     </key>
     <key name="move-to-center" type="as">
       <default>[]</default>
-      <_summary>Move window to center of screen</_summary>
+      <summary>Move window to center of screen</summary>
     </key>
     <key name="switch-input-source" type="as">
       <default><![CDATA[['<Super>space']]]></default>
-      <_summary>Switch input source</_summary>
-      <_description>Binding to select the next input source</_description>
+      <summary>Switch input source</summary>
+      <description>Binding to select the next input source</description>
     </key>
     <key name="switch-input-source-backward" type="as">
       <default><![CDATA[['<Shift><Super>space']]]></default>
-      <_summary>Switch input source backward</_summary>
-      <_description>Binding to select the previous input source</_description>
+      <summary>Switch input source backward</summary>
+      <description>Binding to select the previous input source</description>
     </key>
     <key name="always-on-top" type="as">
       <default>[]</default>
-      <_summary>Toggle window to be always on top</_summary>
-      <_description>Set or unset window to appear always on top</_description>
+      <summary>Toggle window to be always on top</summary>
+      <description>Set or unset window to appear always on top</description>
     </key>
   </schema>
 
diff --git a/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in 
b/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in
similarity index 84%
rename from schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in
rename to schemas/org.gnome.desktop.wm.preferences.gschema.xml.in
index 2a58a42..9717957 100644
--- a/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in
@@ -5,29 +5,29 @@
           gettext-domain="@GETTEXT_PACKAGE@">
     <key name="mouse-button-modifier" type="s">
       <default><![CDATA['<Super>']]></default>
-      <_summary>Modifier to use for modified window click actions</_summary>
-      <_description>
+      <summary>Modifier to use for modified window click actions</summary>
+      <description>
         Clicking a window while holding down this modifier key  will move the
         window (left click), resize the window  (middle click), or show the
         window menu (right click). The middle and right click operations may
         be swapped using the "resize-with-right-button" key. Modifier is
         expressed as <![CDATA["<Alt>"]]> or <![CDATA["<Super>"]]> for example.
-    </_description>
+    </description>
     </key>
     <key name="resize-with-right-button" type="b">
       <default>false</default>
-      <_summary>Whether to resize with the right button</_summary>
-      <_description>
+      <summary>Whether to resize with the right button</summary>
+      <description>
         Set this to true to resize with the right button and show a menu with
         the middle button while holding down the key given in
         "mouse-button-modifier"; set it to false to make it work
         the opposite way around.
-       </_description>
+       </description>
     </key>
     <key name="button-layout" type="s">
       <default>'appmenu:close'</default>
-      <_summary>Arrangement of buttons on the titlebar</_summary>
-      <_description>
+      <summary>Arrangement of buttons on the titlebar</summary>
+      <description>
         Arrangement of buttons on the titlebar. The value should be a string,
         such as  "menu:minimize,maximize,spacer,close"; the colon separates
         the  left corner of the window from the right corner, and  the button
@@ -36,36 +36,36 @@
         future metacity versions  without breaking older versions. A special
         spacer tag can be used to insert some space between
         two adjacent buttons.
-      </_description>
+      </description>
     </key>
     <key name="focus-mode" enum="org.gnome.desktop.GDesktopFocusMode">
       <default>'click'</default>
-      <_summary>Window focus mode</_summary>
-      <_description>
+      <summary>Window focus mode</summary>
+      <description>
         The window focus mode indicates how windows are activated.  It has
         three possible values; "click" means windows must  be clicked in order
         to focus them, "sloppy" means windows are focused when the mouse enters
         the window, and "mouse" means windows are focused when the mouse enters
         the window and  unfocused when the mouse leaves the window.
-      </_description>
+      </description>
     </key>
     <key name="focus-new-windows"
          enum="org.gnome.desktop.GDesktopFocusNewWindows">
       <default>'smart'</default>
-      <_summary>Control how new windows get focus</_summary>
-      <_description>
+      <summary>Control how new windows get focus</summary>
+      <description>
         This option provides additional control over how newly created windows
         get focus.  It has two possible values; "smart" applies the user's
         normal focus mode, and "strict" results in windows started from a
         terminal not being given focus.
-      </_description>
+      </description>
     </key>
     <key name="raise-on-click" type="b">
       <default>true</default>
-      <_summary>
+      <summary>
         Whether windows should be raised when their client area is clicked
-      </_summary>
-      <_description>
+      </summary>
+      <description>
        The default, true, indicates that a window will be raised
        whenever its client area or its frame is clicked.
 
@@ -74,13 +74,13 @@
        click anywhere in the window's frame, or Super-click on any
        part of the window.  This mode is useful if one uses many overlapping
        windows.
-      </_description>
+      </description>
     </key>
     <key name="action-double-click-titlebar"
          enum="org.gnome.desktop.GDesktopTitlebarAction">
       <default>'toggle-maximize'</default>
-      <_summary>Action on title bar double-click</_summary>
-      <_description>
+      <summary>Action on title bar double-click</summary>
+      <description>
         This option determines the effects of double-clicking on the title bar.
 
         Current valid options are 'toggle-shade', which will shade/unshade the
@@ -91,7 +91,7 @@
         the window up, 'menu' which will display the window menu,
         'lower' which will put the window behind all the others,
         and 'none' which will not do anything.
-      </_description>
+      </description>
       <!-- For compatibility with GConf strings (Metacity 2.30) -->
       <aliases>
         <alias value="toggle_shade" target="toggle-shade"/>
@@ -105,8 +105,8 @@
     <key name="action-middle-click-titlebar"
          enum="org.gnome.desktop.GDesktopTitlebarAction">
       <default>'none'</default>
-      <_summary>Action on title bar middle-click</_summary>
-      <_description>
+      <summary>Action on title bar middle-click</summary>
+      <description>
         This option determines the effects of middle-clicking on the title bar.
 
         Current valid options are 'toggle-shade', which will shade/unshade
@@ -117,7 +117,7 @@
         the window up, 'menu' which will display the window menu,
         'lower' which will put the window behind all the others,
         and 'none' which will not do anything.
-      </_description>
+      </description>
       <!-- For compatibility with GConf strings (Metacity 2.30) -->
       <aliases>
         <alias value="toggle_shade" target="toggle-shade"/>
@@ -131,8 +131,8 @@
     <key name="action-right-click-titlebar"
          enum="org.gnome.desktop.GDesktopTitlebarAction">
       <default>'menu'</default>
-      <_summary>Action on title bar right-click</_summary>
-      <_description>
+      <summary>Action on title bar right-click</summary>
+      <description>
         This option determines the effects of right-clicking on the title bar.
 
         Current valid options are 'toggle-shade', which will shade/unshade
@@ -143,7 +143,7 @@
         the window, 'shade' which will roll the window up,
         'menu' which will display the window menu, 'lower' which will put
         the window behind all the others, and 'none' which will not do anything.
-      </_description>
+      </description>
       <!-- For compatibility with GConf strings (Metacity 2.30) -->
       <aliases>
         <alias value="toggle_shade" target="toggle-shade"/>
@@ -156,84 +156,84 @@
     </key>
     <key name="auto-raise" type="b">
       <default>false</default>
-      <_summary>Automatically raises the focused window</_summary>
-      <_description>
+      <summary>Automatically raises the focused window</summary>
+      <description>
         If set to true, and the focus mode is either "sloppy" or "mouse"
         then the focused window will be automatically raised after a delay
         specified by the auto-raise-delay key. This is not related to clicking
         on a window to raise it, nor to entering a window during drag-and-drop.
-      </_description>
+      </description>
     </key>
     <key name="auto-raise-delay" type="i">
       <range min="0" max="10000"/>
       <default>500</default>
-      <_summary>Delay in milliseconds for the auto raise option</_summary>
-      <_description>
+      <summary>Delay in milliseconds for the auto raise option</summary>
+      <description>
         The time delay before raising a window if auto-raise is set to true.
         The delay is given in thousandths of a second.
-      </_description>
+      </description>
     </key>
     <key name="theme" type="s">
       <default>'Adwaita'</default>
-      <_summary>Current theme</_summary>
-      <_description>
+      <summary>Current theme</summary>
+      <description>
         The theme determines the appearance of window borders, titlebar,
         and so forth.
 
         DEPRECATED: This key is deprecated and ignored.
-      </_description>
+      </description>
     </key>
     <key name="titlebar-uses-system-font" type="b">
       <default>false</default>
-      <_summary>Use standard system font in window titles</_summary>
-      <_description>
+      <summary>Use standard system font in window titles</summary>
+      <description>
         If true, ignore the titlebar-font option, and use the standard
         application font for window titles.
-      </_description>
+      </description>
     </key>
     <key name="titlebar-font" type="s">
       <default>'Cantarell Bold 11'</default>
-      <_summary>Window title font</_summary>
-      <_description>
+      <summary>Window title font</summary>
+      <description>
         A font description string describing a font for window titlebars.
         The size from the description will only be used if the
         titlebar-font-size option is set to 0. Also, this option is disabled
         if the titlebar-uses-desktop-font option is set to true.
-      </_description>
+      </description>
     </key>
     <key name="num-workspaces" type="i">
       <default>4</default>
       <range min="1" max="36"/>
-      <_summary>Number of workspaces</_summary>
-      <_description>
+      <summary>Number of workspaces</summary>
+      <description>
         Number of workspaces. Must be more than zero, and has a fixed maximum
         to prevent making the desktop unusable by accidentally asking
         for too many workspaces.
-      </_description>
+      </description>
     </key>
     <key name="audible-bell" type="b">
       <default>true</default>
-      <_summary>System Bell is Audible</_summary>
-      <_description>
+      <summary>System Bell is Audible</summary>
+      <description>
         Determines whether applications or the system can generate audible
         'beeps'; may be used in conjunction with 'visual bell'
         to allow silent 'beeps'.
-      </_description>
+      </description>
     </key>
     <key name="visual-bell" type="b">
       <default>false</default>
-      <_summary>Enable Visual Bell</_summary>
-      <_description>
+      <summary>Enable Visual Bell</summary>
+      <description>
         Turns on a visual indication when an application or the system issues
         a 'bell' or 'beep'; useful for the hard-of-hearing and for use
         in noisy environments.
-      </_description>
+      </description>
     </key>
     <key name="visual-bell-type"
          enum="org.gnome.desktop.GDesktopVisualBellType">
       <default>'fullscreen-flash'</default>
-      <_summary>Visual Bell Type</_summary>
-      <_description>
+      <summary>Visual Bell Type</summary>
+      <description>
         Tells the WM how to implement the visual indication that the
         system bell or another application 'bell' indicator has been rung.
 
@@ -245,7 +245,7 @@
         If the application which sent the bell is unknown (as is usually
         the case for the default "system beep"), the currently focused
         window's titlebar is flashed.
-      </_description>
+      </description>
       <!-- For compatibility with GConf strings (Metacity 2.30) -->
       <aliases>
         <alias value="fullscreen" target="fullscreen-flash"/>
@@ -254,27 +254,27 @@
     </key>
     <key name="disable-workarounds" type="b">
       <default>false</default>
-      <_summary>
+      <summary>
         Disable misfeatures that are required by old or broken applications
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         Some applications disregard specifications in ways that result in
         window manager misfeatures. This option puts the WM in a
         rigorously correct mode, which gives a more consistent
         user interface, provided one does not need to run any
         misbehaving applications.
-      </_description>
+      </description>
     </key>
     <key name="workspace-names" type="as">
       <default>[]</default>
-      <_summary>The names of the workspaces</_summary>
-      <_description>
+      <summary>The names of the workspaces</summary>
+      <description>
         Defines the names that should be assigned to workspaces.
         If the list is too long for the current number of workspaces,
         names in excess will be ignored. If the list is too short, or
         includes empty names, missing values will be replaced with the
         default ("Workspace N").
-      </_description>
+      </description>
     </key>
   </schema>
 
diff --git a/schemas/org.gnome.system.locale.gschema.xml.in.in 
b/schemas/org.gnome.system.locale.gschema.xml.in
similarity index 71%
rename from schemas/org.gnome.system.locale.gschema.xml.in.in
rename to schemas/org.gnome.system.locale.gschema.xml.in
index 4da3f25..3630a7c 100644
--- a/schemas/org.gnome.system.locale.gschema.xml.in.in
+++ b/schemas/org.gnome.system.locale.gschema.xml.in
@@ -2,10 +2,10 @@
   <schema id="org.gnome.system.locale" path="/system/locale/">
     <key name="region" type="s">
       <default>''</default>
-      <_summary>The locale to use for dates / numbers formats</_summary>
-      <_description>
+      <summary>The locale to use for dates / numbers formats</summary>
+      <description>
        Specify the locale to be used for displaying dates, times and numbers formats.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.system.location.gschema.xml.in.in 
b/schemas/org.gnome.system.location.gschema.xml.in
similarity index 80%
rename from schemas/org.gnome.system.location.gschema.xml.in.in
rename to schemas/org.gnome.system.location.gschema.xml.in
index a9821e1..3207a4c 100644
--- a/schemas/org.gnome.system.location.gschema.xml.in.in
+++ b/schemas/org.gnome.system.location.gschema.xml.in
@@ -3,22 +3,22 @@
           path="/org/gnome/system/location/">
     <key type="b" name="enabled">
       <default>false</default>
-      <_summary>Geolocation services are enabled.</_summary>
-      <_description>
+      <summary>Geolocation services are enabled.</summary>
+      <description>
        If true, applications are allowed to access location information.
-      </_description>
+      </description>
     </key>
     <key name="max-accuracy-level" enum="org.gnome.desktop.GDesktopLocationAccuracyLevel">
       <default>'exact'</default>
-      <_summary>The maximum accuracy level of location.</_summary>
-      <_description>
+      <summary>The maximum accuracy level of location.</summary>
+      <description>
         Configures the maximum level of location accuracy applications are
         allowed to see. Valid options are 'country', 'city', 'neighborhood',
         'street', and 'exact' (typically requires GPS receiver). Please keep in
         mind that this only controls what GeoClue will allow applications to see
         and they can find user's location on their own using network resources
         (albeit with street-level accuracy at best).
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/schemas/org.gnome.system.proxy.gschema.xml.in.in b/schemas/org.gnome.system.proxy.gschema.xml.in
similarity index 76%
rename from schemas/org.gnome.system.proxy.gschema.xml.in.in
rename to schemas/org.gnome.system.proxy.gschema.xml.in
index b815ed4..a72ef41 100644
--- a/schemas/org.gnome.system.proxy.gschema.xml.in.in
+++ b/schemas/org.gnome.system.proxy.gschema.xml.in
@@ -6,8 +6,8 @@
     <child name="socks" schema="org.gnome.system.proxy.socks"/>
     <key name="mode" enum="org.gnome.desktop.GDesktopProxyMode">
       <default>'none'</default>
-      <_summary>Proxy configuration mode</_summary>
-      <_description>
+      <summary>Proxy configuration mode</summary>
+      <description>
         Select the proxy configuration mode. Supported values are "none", 
         "manual", "auto".
 
@@ -28,65 +28,65 @@
         If a SOCKS proxy is configured, it is used for all protocols,
         except that the http, https, and ftp proxy settings override
         it for those protocols only.
-      </_description>
+      </description>
     </key>
     <key name="autoconfig-url" type="s">
       <default>''</default>
-      <_summary>Automatic proxy configuration URL</_summary>
-      <_description>
+      <summary>Automatic proxy configuration URL</summary>
+      <description>
         URL that provides proxy configuration values. When mode is
         "auto", this URL is used to look up proxy information for all
         protocols.
-      </_description>
+      </description>
     </key>
     <key name="ignore-hosts" type="as">
       <default>[ 'localhost', '127.0.0.0/8', '::1' ]</default>
-      <_summary>Non-proxy hosts</_summary>
-      <_description>
+      <summary>Non-proxy hosts</summary>
+      <description>
         This key contains a list of hosts which are connected to directly, 
         rather than via the proxy (if it is active). The values can be 
         hostnames, domains (using an initial wildcard like *.foo.com), IP host 
         addresses (both IPv4 and IPv6) and network addresses with a netmask 
         (something like 192.168.0.0/24).
-      </_description>
+      </description>
     </key>
     <key name="use-same-proxy" type="b">
       <default>true</default>
-      <_summary>Unused; ignore</_summary>
-      <_description>
+      <summary>Unused; ignore</summary>
+      <description>
         This key is not used, and should not be read or modified.
-      </_description>
+      </description>
     </key>
   </schema>
   <schema id="org.gnome.system.proxy.http" path="/system/proxy/http/">
     <key name="enabled" type="b">
       <default>false</default>
-      <_summary>Unused; ignore</_summary>
-      <_description>
+      <summary>Unused; ignore</summary>
+      <description>
         This key is not used; HTTP proxying is enabled when the host
         key is non-empty and the port is non-0.
-      </_description>
+      </description>
     </key>
     <key name="host" type="s">
       <default>''</default>
-      <_summary>HTTP proxy host name</_summary>
-      <_description>
+      <summary>HTTP proxy host name</summary>
+      <description>
         The machine name to proxy HTTP through.
-      </_description>
+      </description>
     </key>
     <key name="port" type="i">
       <range min="0" max="65535"/>
       <default>8080</default>
-      <_summary>HTTP proxy port</_summary>
-      <_description>
+      <summary>HTTP proxy port</summary>
+      <description>
         The port on the machine defined by "/system/proxy/http/host" that you 
         proxy through.
-      </_description>
+      </description>
     </key>
     <key name="use-authentication" type="b">
       <default>false</default>
-      <_summary>Authenticate proxy server connections</_summary>
-      <_description>
+      <summary>Authenticate proxy server connections</summary>
+      <description>
         If true, then connections to the proxy server require authentication. 
         The username/password combo is defined by 
         "/system/proxy/http/authentication-user" and 
@@ -95,75 +95,75 @@
         This applies only to the http proxy; when using a separate
         https proxy, there is currently no way to specify that it
         should use authentication.
-      </_description>
+      </description>
     </key>
     <key name="authentication-user" type="s">
       <default>''</default>
-      <_summary>HTTP proxy username</_summary>
-      <_description>
+      <summary>HTTP proxy username</summary>
+      <description>
         User name to pass as authentication when doing HTTP proxying.
-      </_description>
+      </description>
     </key>
     <key name="authentication-password" type="s">
       <default>''</default>
-      <_summary>HTTP proxy password</_summary>
-      <_description>
+      <summary>HTTP proxy password</summary>
+      <description>
         Password to pass as authentication when doing HTTP proxying.
-      </_description>
+      </description>
     </key>
   </schema>
   <schema id="org.gnome.system.proxy.https" path="/system/proxy/https/">
     <key name="host" type="s">
       <default>''</default>
-      <_summary>Secure HTTP proxy host name</_summary>
-      <_description>
+      <summary>Secure HTTP proxy host name</summary>
+      <description>
         The machine name to proxy secure HTTP through.
-      </_description>
+      </description>
     </key>
     <key name="port" type="i">
       <range min="0" max="65535"/>
       <default>0</default>
-      <_summary>Secure HTTP proxy port</_summary>
-      <_description>
+      <summary>Secure HTTP proxy port</summary>
+      <description>
         The port on the machine defined by "/system/proxy/https/host" that you 
         proxy through.
-      </_description>
+      </description>
     </key>
   </schema>
   <schema id="org.gnome.system.proxy.ftp" path="/system/proxy/ftp/">
     <key name="host" type="s">
       <default>''</default>
-      <_summary>FTP proxy host name</_summary>
-      <_description>
+      <summary>FTP proxy host name</summary>
+      <description>
         The machine name to proxy FTP through.
-      </_description>
+      </description>
     </key>
     <key name="port" type="i">
       <range min="0" max="65535"/>
       <default>0</default>
-      <_summary>FTP proxy port</_summary>
-      <_description>
+      <summary>FTP proxy port</summary>
+      <description>
         The port on the machine defined by "/system/proxy/ftp/host" that you 
         proxy through.
-      </_description>
+      </description>
     </key>
   </schema>
   <schema id="org.gnome.system.proxy.socks" path="/system/proxy/socks/">
     <key name="host" type="s">
       <default>''</default>
-      <_summary>SOCKS proxy host name</_summary>
-      <_description>
+      <summary>SOCKS proxy host name</summary>
+      <description>
         The machine name to use as a SOCKS proxy.
-      </_description>
+      </description>
     </key>
     <key name="port" type="i">
       <range min="0" max="65535"/>
       <default>0</default>
-      <_summary>SOCKS proxy port</_summary>
-      <_description>
+      <summary>SOCKS proxy port</summary>
+      <description>
         The port on the machine defined by "/system/proxy/socks/host" that you 
         proxy through.
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]