Rework gsettings schema building

 * Bump intltool required version for gsettings support
 * Extract strings with intltool directly

7 files changed, 509 insertions, 513 deletions

diff --git a/configure.ac b/configure.ac
index a8f0b2c7..8ead1319 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,7 @@ AH_TEMPLATE([HAVE_RENDER])
 AM_GLIB_GNU_GETTEXT
 GLIB_DEFINE_LOCALEDIR(MATELOCALEDIR)
 
-IT_PROG_INTLTOOL([0.40.1])
+IT_PROG_INTLTOOL([0.50.1])
 
 dnl ==========================================================================
 
diff --git a/libcaja-private/Makefile.am b/libcaja-private/Makefile.am
index 4e7b10f9..947f9ef1 100644
--- a/libcaja-private/Makefile.am
+++ b/libcaja-private/Makefile.am
@@ -217,9 +217,7 @@ caja-marshal.list: $(libcaja_private_la_SOURCES) Makefile.am
 	$(AM_V_GEN)echo "#include \"caja-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
 
-gsettingsschema_in_files = org.mate.caja.gschema.xml.in org.mate.media-handling.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-.PRECIOUS: $(gsettings_SCHEMAS)
+gsettings_SCHEMAS = org.mate.caja.gschema.xml org.mate.media-handling.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
@@ -230,7 +228,7 @@ convert_DATA = caja.convert
 
 EXTRA_DIST = \
 	caja-marshal.list \
-	$(gsettingsschema_in_files) \
+	$(gsettings_SCHEMAS) \
 	$(convert_DATA) \
 	$(BEAGLE_SOURCES) \
 	$(TRACKER_SOURCES) \
@@ -238,9 +236,7 @@ EXTRA_DIST = \
 
 CLEANFILES = \
 	$(BUILT_SOURCES) \
-	$(schema_DATA) \
-	$(gsettings_SCHEMAS) \
-	caja-marshal.list				\
+	caja-marshal.list \
 	$(NULL)
 
 dist-hook:
diff --git a/libcaja-private/org.mate.caja.gschema.xml b/libcaja-private/org.mate.caja.gschema.xml
new file mode 100644
index 00000000..8492c1ff
--- /dev/null
+++ b/libcaja-private/org.mate.caja.gschema.xml
@@ -0,0 +1,469 @@
+<schemalist>
+  <enum id="org.mate.caja.SpeedTradeoff">
+    <value nick="always" value="0"/>
+    <value nick="local-only" value="1"/>
+    <value nick="never" value="2"/>
+  </enum>
+
+  <enum id="org.mate.caja.ClickPolicy">
+    <value nick="single" value="0"/>
+    <value nick="double" value="1"/>
+  </enum>
+
+  <enum id="org.mate.caja.ActivationChoice">
+    <value nick="launch" value="0"/>
+    <value nick="display" value="1"/>
+    <value nick="ask" value="2"/>
+  </enum>
+
+  <enum id="org.mate.caja.FolderView">
+    <value nick="icon-view" value="0"/>
+    <value nick="compact-view" value="1"/>
+    <value nick="list-view" value="2"/>
+  </enum>
+
+  <enum id="org.mate.caja.DateFormat">
+    <value nick="locale" value="0"/>
+    <value nick="iso" value="1"/>
+    <value nick="informal" value="2"/>
+  </enum>
+
+  <enum id="org.mate.caja.SortOrder">
+    <value nick="manually" value="0"/>
+    <value nick="name" value="1"/>
+    <value nick="directory" value="2"/>
+    <value nick="size" value="3"/>
+    <value nick="type" value="4"/>
+    <value nick="mtime" value="5"/>
+    <value nick="atime" value="6"/>
+    <value nick="emblems" value="7"/>
+    <value nick="trash-time" value="8"/>
+  </enum>
+
+  <enum id="org.mate.caja.ZoomLevel">
+    <value nick="smallest" value="0"/>
+    <value nick="smaller" value="1"/>
+    <value nick="small" value="2"/>
+    <value nick="standard" value="3"/>
+    <value nick="large" value="4"/>
+    <value nick="larger" value="5"/>
+    <value nick="largest" value="6"/>
+  </enum>
+
+  <enum id="org.mate.caja.TabPosition">
+    <value nick="after-current-tab" value="0"/>
+    <value nick="end" value="1"/>
+  </enum>
+
+  <schema id="org.mate.caja" path="/org/mate/caja/" gettext-domain="caja">
+    <child name="preferences" schema="org.mate.caja.preferences"/>
+    <child name="icon-view" schema="org.mate.caja.icon-view"/>
+    <child name="compact-view" schema="org.mate.caja.compact-view"/>
+    <child name="list-view" schema="org.mate.caja.list-view"/>
+    <child name="sidebar-panels" schema="org.mate.caja.sidebar-panels"/>
+    <child name="desktop" schema="org.mate.caja.desktop"/>
+    <child name="window-state" schema="org.mate.caja.window-state"/>
+  </schema>
+
+  <schema id="org.mate.caja.preferences" path="/org/mate/caja/preferences/" gettext-domain="caja">
+    <key name="tabs-open-position" enum="org.mate.caja.TabPosition">
+      <aliases>
+    <alias value='after_current_tab' target='after-current-tab'/>
+      </aliases>
+      <default>'after-current-tab'</default>
+      <summary>Where to position newly open tabs in browser windows.</summary>
+      <description>If set to "after-current-tab", then new tabs are inserted after the current tab. If set to "end", then new tabs are appended to the end of the tab list.</description>
+    </key>
+    <key name="exit-with-last-window" type="b">
+      <default>false</default>
+      <summary>Caja will exit when last window destroyed.</summary>
+      <description>If set to true, then Caja will exit when all windows are destroyed. This is the default setting. If set to false, it can be started without any window, so caja can serve as a daemon to monitor media automount, or similar tasks.</description>
+    </key>
+    <key name="always-use-browser" type="b">
+      <default>true</default>
+      <summary>Enables the classic Caja behavior, where all windows are browsers</summary>
+      <description>If set to true, then all Caja windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior.</description>
+    </key>
+    <key name="always-use-location-entry" type="b">
+      <default>false</default>
+      <summary>Always use the location entry, instead of the pathbar</summary>
+      <description>If set to true, then Caja browser windows will always use a textual input entry for the location toolbar, instead of the pathbar.</description>
+    </key>
+    <key name="confirm-trash" type="b">
+      <default>true</default>
+      <summary>Whether to ask for confirmation when deleting files, or emptying Trash</summary>
+      <description>If set to true, then Caja will ask for confirmation when  you attempt to delete files, or empty the Trash.</description>
+    </key>
+    <key name="enable-delete" type="b">
+      <default>false</default>
+      <summary>Whether to enable immediate deletion</summary>
+      <description>If set to true, then Caja will have a feature allowing you to delete a file immediately and in-place, instead of moving it  to the trash. This feature can be dangerous, so use caution.</description>
+    </key>
+    <key name="show-icon-text" enum="org.mate.caja.SpeedTradeoff">
+      <aliases><alias value='local_only' target='local-only'/></aliases>
+      <default>'local-only'</default>
+      <summary>When to show preview text in icons</summary>
+      <description>Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to "always" then always show previews,  even if the folder is on a remote server. If set to "local-only" then only show previews for local file systems. If set to "never" then never bother to read preview data.</description>
+    </key>
+    <key name="show-directory-item-counts"  enum="org.mate.caja.SpeedTradeoff">
+      <aliases><alias value='local_only' target='local-only'/></aliases>
+      <default>'local-only'</default>
+      <summary>When to show number of items in a folder</summary>
+      <description>Speed tradeoff for when to show the number of items in a  folder. If set to "always" then always show item counts,  even if the folder is on a remote server.  If set to "local-only" then only show counts for local file systems. If set to "never" then never bother to compute item counts.</description>
+    </key>
+    <key name="click-policy" enum="org.mate.caja.ClickPolicy">
+      <default>'double'</default>
+      <summary>Type of click used to launch/open files</summary>
+      <description>Possible values are "single" to launch files on a single click,  or "double" to launch them on a double click.</description>
+    </key>
+    <key name="executable-text-activation" enum="org.mate.caja.ActivationChoice">
+      <default>'ask'</default>
+      <summary>What to do with executable text files when activated</summary>
+      <description>What to do with executable text files when they are activated (single or double clicked). Possible values are "launch" to launch them as programs, "ask" to ask what to do via a dialog, and "display" to display them as text files.</description>
+    </key>
+    <key name="install-mime-activation" type="b">
+      <default>true</default>
+      <summary>Show the package installer for unknown mime types</summary>
+      <description>Whether to show the user a package installer dialog in case an unknown mime type is opened, in order to search for an application to handle it.</description>
+    </key>
+    <key name="mouse-use-extra-buttons" type="b">
+      <default>true</default>
+      <summary>Use extra mouse button events in Caja' browser window</summary>
+      <description>For users with mice that have "Forward" and "Back" buttons, this key will determine if any action is taken inside of Caja when either is pressed.</description>
+    </key>
+    <key name="mouse-forward-button" type="i">
+      <default>9</default>
+      <summary>Mouse button to activate the "Forward" command in browser window</summary>
+      <description>For users with mice that have buttons for "Forward" and "Back", this key will set which button activates the "Forward" command in a browser window. Possible values range between 6 and 14.</description>
+    </key>
+    <key name="mouse-back-button" type="i">
+      <default>8</default>
+      <summary>Mouse button to activate the "Back" command in browser window</summary>
+      <description>For users with mice that have buttons for "Forward" and "Back", this key will set which button activates the "Back" command in a browser window. Possible values range between 6 and 14.</description>
+    </key>
+    <key name="show-image-thumbnails" enum="org.mate.caja.SpeedTradeoff">
+      <aliases><alias value='local_only' target='local-only'/></aliases>
+      <default>'local-only'</default>
+      <summary>When to show thumbnails of image files</summary>
+      <description>Speed tradeoff for when to show an image file as a thumbnail. If set to "always" then always thumbnail,  even if the folder is on a remote server. If set to "local-only" then only show thumbnails for local file systems. If set to "never" then never bother to thumbnail images, just use a generic icon.</description>
+    </key>
+    <key name="thumbnail-limit" type="t">
+      <default>10485760</default>
+      <summary>Maximum image size for thumbnailing</summary>
+      <description>Images over this size (in bytes) won't be  thumbnailed. The purpose of this setting is to  avoid thumbnailing large images that may take a long time to load or use lots of memory.</description>
+    </key>
+    <key name="preview-sound" enum="org.mate.caja.SpeedTradeoff">
+      <aliases><alias value='local_only' target='local-only'/></aliases>
+      <default>'local-only'</default>
+      <summary>Whether to preview sounds when mousing over an icon</summary>
+      <description>Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to "always" then always plays the sound,  even if the file is on a remote server. If set to "local-only" then only plays previews on local file systems. If set to "never" then it never previews sound.</description>
+    </key>
+    <key name="show-advanced-permissions" type="b">
+      <default>false</default>
+      <summary>Show advanced permissions in the file property dialog</summary>
+      <description>If set to true, then Caja lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options.</description>
+    </key>
+    <key name="sort-directories-first" type="b">
+      <default>true</default>
+      <summary>Show folders first in windows</summary>
+      <description>If set to true, then Caja shows folders prior to showing files in the icon and list views.</description>
+    </key>
+    <key name="default-sort-order" enum="org.mate.caja.SortOrder">
+      <aliases>
+        <alias value='modification_date' target='mtime'/>
+      </aliases>
+      <default>'name'</default>
+      <summary>Default sort order</summary>
+      <description>The default sort-order for items in the icon view. Possible values are "name", "size", "type", "mtime", and "emblems".</description>
+    </key>
+    <key name="default-sort-in-reverse-order" type="b">
+      <default>false</default>
+      <summary>Reverse sort order in new windows</summary>
+      <description>If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from "a" to "z", they will be sorted from "z" to "a"; if sorted by size, instead of being incrementally they will be sorted decrementally.</description>
+    </key>
+    <key name="desktop-is-home-dir" type="b">
+      <default>false</default>
+      <summary>Caja uses the users home folder as the desktop</summary>
+      <description>If set to true, then Caja will use the user's home folder as the desktop.  If it is false, then it will use ~/Desktop as the desktop.</description>
+    </key>
+    <key name="background-set" type="b">
+      <default>false</default>
+      <summary>Custom Background</summary>
+      <description>Whether a custom default folder background has been set.</description>
+    </key>
+    <key name="background-color" type="s">
+      <default>'#ffffff'</default>
+      <summary>Default Background Color</summary>
+      <description>Color for the default folder background.  Only used if background_set is true.</description>
+    </key>
+    <key name="background-uri" type="s">
+      <default>''</default>
+      <summary>Default Background Filename</summary>
+      <description>Uri of the default folder background.  Only used if background_set is true.</description>
+    </key>
+    <key name="side-pane-background-set" type="b">
+      <default>false</default>
+      <summary>Custom Side Pane Background Set</summary>
+      <description>Whether a custom default side pane background has been set.</description>
+    </key>
+    <key name="side-pane-background-color" type="s">
+      <default>'#ffffff'</default>
+      <summary>Default Side Pane Background Color</summary>
+      <description>Filename for the default side pane background.  Only used if side_pane_background_set is true.</description>
+    </key>
+    <key name="side-pane-background-uri" type="s">
+      <default>""</default>
+      <summary>Default Side Pane Background Filename</summary>
+      <description>Uri of the default side pane background.  Only used if side_pane_background_set is true.</description>
+    </key>
+    <key name="default-folder-viewer" enum="org.mate.caja.FolderView">
+      <aliases>
+        <alias value='icon_view' target='icon-view'/>
+        <alias value='compact_view' target='compact-view'/>
+        <alias value='list_view' target='list-view'/>
+      </aliases>
+      <default>'icon-view'</default>
+      <summary>Default folder viewer</summary>
+      <description>When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are "list-view", "icon-view" and "compact-view".</description>
+    </key>
+    <key name="date-format" enum="org.mate.caja.DateFormat">
+      <default>'locale'</default>
+      <summary>Date Format</summary>
+      <description>The format of file dates. Possible values are "locale", "iso", and "informal".</description>
+    </key>
+    <key name="show-hidden-files" type="b">
+      <default>false</default>
+      <summary>Whether to show hidden files</summary>
+      <description>If set to true, then hidden files are shown by default in the file manager.  Hidden files are either dotfiles, listed in the folder's .hidden file or backup files ending with a tilde (~).</description>
+    </key>
+    <key name="use-iec-units" type="b">
+      <default>false</default>
+      <summary>Whether to show file sizes with IEC units</summary>
+      <description>If set to true, file sizes are shown using IEC (base 1024) units with "KiB" style suffixes, instead of default with SI units.</description>
+    </key>
+  </schema>
+
+  <schema id="org.mate.caja.icon-view" path="/org/mate/caja/icon-view/" gettext-domain="caja">
+    <key name="captions" type="as">
+      <default>[ 'none', 'size', 'date_modified' ]</default>
+      <summary>List of possible captions on icons</summary>
+      <description>A list of captions below an icon in the icon view and
+      the desktop.  The actual number of captions shown depends on
+      the zoom level.  Some possible values are:
+      "size", "type", "date_modified", "date_changed", "date_accessed", "owner",
+      "group", "permissions", "octal_permissions" and "mime_type".</description>
+    </key>
+    <key name="default-use-tighter-layout" type="b">
+      <default>false</default>
+      <summary>Use tighter layout in new windows</summary>
+      <description>If true, icons will be laid out tighter by default in new windows.</description>
+    </key>
+    <key name="labels-beside-icons" type="b">
+      <default>false</default>
+      <summary>Put labels beside icons</summary>
+      <description>If true, labels will be placed beside icons rather than underneath them.</description>
+    </key>
+    <key name="default-zoom-level" enum="org.mate.caja.ZoomLevel">
+      <default>'standard'</default>
+      <summary>Default icon zoom level</summary>
+      <description>Default zoom level used by the icon view.</description>
+    </key>
+    <key name="thumbnail-size" type="i">
+      <default>64</default>
+      <summary>Default Thumbnail Icon Size</summary>
+      <description>The default size of an icon for a thumbnail in the icon view.</description>
+    </key>
+    <key name="text-ellipsis-limit" type="as">
+      <default>[ '3' ]</default>
+      <summary>Text Ellipsis Limit</summary>
+      <description>A string specifying how parts of overlong file names
+         should be replaced by ellipses, depending on the zoom
+         level.
+         Each of the list entries is of the form "Zoom Level:Integer".
+         For each specified zoom level, if the given integer is
+         larger than 0, the file name will not exceed the given number of lines.
+         If the integer is 0 or smaller, no limit is imposed on the specified zoom level.
+         A default entry of the form "Integer" without any specified zoom level
+         is also allowed. It defines the maximum number of lines for all other zoom levels.
+         Examples:
+         0 - always display overlong file names;
+         3 - shorten file names if they exceed three lines;
+         smallest:5,smaller:4,0 - shorten file names if they exceed five lines
+         for zoom level "smallest". Shorten file names if they exceed four lines
+         for zoom level "smaller". Do not shorten file names for other zoom levels.
+
+         Available zoom levels:
+         smallest (33%), smaller (50%), small (66%), standard (100%), large (150%),
+         larger (200%), largest (400%)</description>
+    </key>
+  </schema>
+
+  <schema id="org.mate.caja.compact-view" path="/org/mate/caja/compact-view/" gettext-domain="caja">
+    <key name="default-zoom-level" enum="org.mate.caja.ZoomLevel">
+      <default>'standard'</default>
+      <summary>Default compact view zoom level</summary>
+      <description>Default zoom level used by the compact view.</description>
+    </key>
+    <key name="all-columns-have-same-width" type="b">
+      <default>true</default>
+      <summary>All columns have same width</summary>
+      <description>If this preference is set, all columns in the compact view have the same width. Otherwise, the width of each column is determined seperately.</description>
+    </key>
+  </schema>
+
+  <schema id="org.mate.caja.list-view" path="/org/mate/caja/list-view/" gettext-domain="caja">
+    <key name="default-zoom-level" enum="org.mate.caja.ZoomLevel">
+      <default>'smaller'</default>
+      <summary>Default list zoom level</summary>
+      <description>Default zoom level used by the list view.</description>
+    </key>
+    <key name="default-visible-columns" type="as">
+      <default>[ 'name', 'size', 'type', 'date_modified' ]</default>
+      <summary>Default list of columns visible in the list view</summary>
+      <description>Default list of columns visible in the list view.</description>
+    </key>
+    <key name="default-column-order" type="as">
+      <default>[ 'name', 'size', 'type', 'date_modified' ]</default>
+      <summary>Default column order in the list view</summary>
+      <description>Default column order in the list view.</description>
+    </key>
+  </schema>
+
+  <schema id="org.mate.caja.sidebar-panels" path="/org/mate/caja/sidebar-panels/" gettext-domain="caja">
+    <child name="tree" schema="org.mate.caja.sidebar-panels.tree"/>
+  </schema>
+
+  <schema id="org.mate.caja.sidebar-panels.tree" path="/org/mate/caja/sidebar-panels/tree/" gettext-domain="caja">
+    <key name="show-only-directories" type="b">
+      <default>true</default>
+      <summary>Only show folders in the tree side pane</summary>
+      <description>If set to true, Caja will only show folders in the tree side pane. Otherwise it will show both folders and files.</description>
+    </key>
+  </schema>
+
+  <schema id="org.mate.caja.desktop" path="/org/mate/caja/desktop/" gettext-domain="caja">
+    <key name="font" type="s">
+      <default l10n="messages" context="desktop-font">'Sans 10'</default>
+      <summary>Desktop font</summary>
+      <description>The font description used for the icons on the desktop.</description>
+    </key>
+    <key name="home-icon-visible" type="b">
+      <default>true</default>
+      <summary>Home icon visible on desktop</summary>
+      <description>If this is set to true, an icon linking to the home folder will be put on the desktop.</description>
+    </key>
+    <key name="computer-icon-visible" type="b">
+      <default>true</default>
+      <summary>Computer icon visible on desktop</summary>
+      <description>If this is set to true, an icon linking to the computer location will be put on the desktop.</description>
+    </key>
+    <key name="trash-icon-visible" type="b">
+      <default>true</default>
+      <summary>Trash icon visible on desktop</summary>
+      <description>If this is set to true, an icon linking to the trash will be put on the desktop.</description>
+    </key>
+    <key name="volumes-visible" type="b">
+      <default>true</default>
+      <summary>Show mounted volumes on the desktop</summary>
+      <description>If this is set to true, icons linking to mounted volumes will be put on the desktop.</description>
+    </key>
+    <key name="network-icon-visible" type="b">
+      <default>false</default>
+      <summary>Network Servers icon visible on the desktop</summary>
+      <description>If this is set to true, an icon linking to the Network Servers view will be put on the desktop.</description>
+    </key>
+    <key name="computer-icon-name" type="s">
+      <default>''</default>
+      <summary>Desktop computer icon name</summary>
+      <description>This name can be set if you want a custom name for the computer icon on the desktop.</description>
+    </key>
+    <key name="home-icon-name" type="s">
+      <default>''</default>
+      <summary>Desktop home icon name</summary>
+      <description>This name can be set if you want a custom name for the home icon on the desktop.</description>
+    </key>
+    <key name="trash-icon-name" type="s">
+      <default>''</default>
+      <summary>Desktop trash icon name</summary>
+      <description>This name can be set if you want a custom name for the trash icon on the desktop.</description>
+    </key>
+    <key name="network-icon-name" type="s">
+      <default>''</default>
+      <summary>Network servers icon name</summary>
+      <description>This name can be set if you want a custom name for the network servers icon on the desktop.</description>
+    </key>
+    <key name="text-ellipsis-limit" type="i">
+      <default>3</default>
+      <summary>Text Ellipsis Limit</summary>
+      <description>An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines.</description>
+    </key>
+  </schema>
+
+  <schema id="org.mate.caja.window-state" path="/org/mate/caja/window-state/" gettext-domain="caja">
+    <key name="geometry" type="s">
+      <default>''</default>
+      <summary>The geometry string for a navigation window.</summary>
+      <description>A string containing the saved geometry and coordinates string for navigation windows.</description>
+    </key>
+    <key name="maximized" type="b">
+      <default>false</default>
+      <summary>Whether the navigation window should be maximized.</summary>
+      <description>Whether the navigation window should be maximized by default.</description>
+    </key>
+    <key name="sidebar-width" type="i">
+      <default>148</default>
+      <summary>Width of the side pane</summary>
+      <description>The default width of the side pane in new windows.</description>
+    </key>
+    <key name="start-with-toolbar" type="b">
+      <default>true</default>
+      <summary>Show toolbar in new windows</summary>
+      <description>If set to true, newly opened windows will have toolbars visible.</description>
+    </key>
+    <key name="start-with-location-bar" type="b">
+      <default>true</default>
+      <summary>Show location bar in new windows</summary>
+      <description>If set to true, newly opened windows will have the location bar visible.</description>
+    </key>
+    <key name="start-with-status-bar" type="b">
+      <default>true</default>
+      <summary>Show status bar in new windows</summary>
+      <description>If set to true, newly opened windows will have the status bar visible.</description>
+    </key>
+    <key name="start-with-sidebar" type="b">
+      <default>true</default>
+      <summary>Show side pane in new windows</summary>
+      <description>If set to true, newly opened windows will have the side pane visible.</description>
+    </key>
+    <key name="side-pane-view" type="s">
+      <choices>
+    <choice value='emblems'/>
+    <choice value='history'/>
+    <choice value='information'/>
+    <choice value='notes'/>
+    <choice value='places'/>
+    <choice value='tree'/>
+      </choices>
+      <aliases>
+    <alias value='CajaEmblemSidebar' target='emblems'/>
+    <alias value='CajaHistorySidebar' target='history'/>
+    <alias value='CajaInformationPanel' target='information'/>
+    <alias value='CajaNotesSidebar' target='notes'/>
+    <alias value='CajaPlacesSidebar' target='places'/>
+    <alias value='CajaTreeSidebar' target='tree'/>
+      </aliases>
+      <default>'places'</default>
+      <summary>Side pane view</summary>
+      <description>The side pane view to show in newly opened windows.</description>
+    </key>
+  </schema>
+
+  <schema path="/org/mate/caja/extensions/" id="org.mate.caja.extensions" gettext-domain="caja">
+    <key type="as" name="disabled-extensions">
+      <default>[  ]</default>
+      <summary>List of extensions in disabled state.</summary>
+      <description>This list contains the extensions that are currently de-activated.</description>
+    </key>
+  </schema>
+
+</schemalist>
diff --git a/libcaja-private/org.mate.caja.gschema.xml.in b/libcaja-private/org.mate.caja.gschema.xml.in
deleted file mode 100644
index 8aef7ade..00000000
--- a/libcaja-private/org.mate.caja.gschema.xml.in
+++ /dev/null
@@ -1,469 +0,0 @@
-<schemalist>
-  <enum id="org.mate.caja.SpeedTradeoff">
-    <value nick="always" value="0"/>
-    <value nick="local-only" value="1"/>
-    <value nick="never" value="2"/>
-  </enum>
-
-  <enum id="org.mate.caja.ClickPolicy">
-    <value nick="single" value="0"/>
-    <value nick="double" value="1"/>
-  </enum>
-
-  <enum id="org.mate.caja.ActivationChoice">
-    <value nick="launch" value="0"/>
-    <value nick="display" value="1"/>
-    <value nick="ask" value="2"/>
-  </enum>
-
-  <enum id="org.mate.caja.FolderView">
-    <value nick="icon-view" value="0"/>
-    <value nick="compact-view" value="1"/>
-    <value nick="list-view" value="2"/>
-  </enum>
-
-  <enum id="org.mate.caja.DateFormat">
-    <value nick="locale" value="0"/>
-    <value nick="iso" value="1"/>
-    <value nick="informal" value="2"/>
-  </enum>
-
-  <enum id="org.mate.caja.SortOrder">
-    <value nick="manually" value="0"/>
-    <value nick="name" value="1"/>
-    <value nick="directory" value="2"/>
-    <value nick="size" value="3"/>
-    <value nick="type" value="4"/>
-    <value nick="mtime" value="5"/>
-    <value nick="atime" value="6"/>
-    <value nick="emblems" value="7"/>
-    <value nick="trash-time" value="8"/>
-  </enum>
-
-  <enum id="org.mate.caja.ZoomLevel">
-    <value nick="smallest" value="0"/>
-    <value nick="smaller" value="1"/>
-    <value nick="small" value="2"/>
-    <value nick="standard" value="3"/>
-    <value nick="large" value="4"/>
-    <value nick="larger" value="5"/>
-    <value nick="largest" value="6"/>
-  </enum>
-
-  <enum id="org.mate.caja.TabPosition">
-    <value nick="after-current-tab" value="0"/>
-    <value nick="end" value="1"/>
-  </enum>
-
-  <schema id="org.mate.caja" path="/org/mate/caja/" gettext-domain="caja">
-    <child name="preferences" schema="org.mate.caja.preferences"/>
-    <child name="icon-view" schema="org.mate.caja.icon-view"/>
-    <child name="compact-view" schema="org.mate.caja.compact-view"/>
-    <child name="list-view" schema="org.mate.caja.list-view"/>
-    <child name="sidebar-panels" schema="org.mate.caja.sidebar-panels"/>
-    <child name="desktop" schema="org.mate.caja.desktop"/>
-    <child name="window-state" schema="org.mate.caja.window-state"/>
-  </schema>
-
-  <schema id="org.mate.caja.preferences" path="/org/mate/caja/preferences/" gettext-domain="caja">
-    <key name="tabs-open-position" enum="org.mate.caja.TabPosition">
-      <aliases>
-    <alias value='after_current_tab' target='after-current-tab'/>
-      </aliases>
-      <default>'after-current-tab'</default>
-      <_summary>Where to position newly open tabs in browser windows.</_summary>
-      <_description>If set to "after-current-tab", then new tabs are inserted after the current tab. If set to "end", then new tabs are appended to the end of the tab list.</_description>
-    </key>
-    <key name="exit-with-last-window" type="b">
-      <default>false</default>
-      <_summary>Caja will exit when last window destroyed.</_summary>
-      <_description>If set to true, then Caja will exit when all windows are destroyed. This is the default setting. If set to false, it can be started without any window, so caja can serve as a daemon to monitor media automount, or similar tasks.</_description>
-    </key>
-    <key name="always-use-browser" type="b">
-      <default>true</default>
-      <_summary>Enables the classic Caja behavior, where all windows are browsers</_summary>
-      <_description>If set to true, then all Caja windows will be browser windows. This is how Nautilus used to behave before version 2.6, and some people prefer this behavior.</_description>
-    </key>
-    <key name="always-use-location-entry" type="b">
-      <default>false</default>
-      <_summary>Always use the location entry, instead of the pathbar</_summary>
-      <_description>If set to true, then Caja browser windows will always use a textual input entry for the location toolbar, instead of the pathbar.</_description>
-    </key>
-    <key name="confirm-trash" type="b">
-      <default>true</default>
-      <_summary>Whether to ask for confirmation when deleting files, or emptying Trash</_summary>
-      <_description>If set to true, then Caja will ask for confirmation when  you attempt to delete files, or empty the Trash.</_description>
-    </key>
-    <key name="enable-delete" type="b">
-      <default>false</default>
-      <_summary>Whether to enable immediate deletion</_summary>
-      <_description>If set to true, then Caja will have a feature allowing you to delete a file immediately and in-place, instead of moving it  to the trash. This feature can be dangerous, so use caution.</_description>
-    </key>
-    <key name="show-icon-text" enum="org.mate.caja.SpeedTradeoff">
-      <aliases><alias value='local_only' target='local-only'/></aliases>
-      <default>'local-only'</default>
-      <_summary>When to show preview text in icons</_summary>
-      <_description>Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to "always" then always show previews,  even if the folder is on a remote server. If set to "local-only" then only show previews for local file systems. If set to "never" then never bother to read preview data.</_description>
-    </key>
-    <key name="show-directory-item-counts"  enum="org.mate.caja.SpeedTradeoff">
-      <aliases><alias value='local_only' target='local-only'/></aliases>
-      <default>'local-only'</default>
-      <_summary>When to show number of items in a folder</_summary>
-      <_description>Speed tradeoff for when to show the number of items in a  folder. If set to "always" then always show item counts,  even if the folder is on a remote server.  If set to "local-only" then only show counts for local file systems. If set to "never" then never bother to compute item counts.</_description>
-    </key>
-    <key name="click-policy" enum="org.mate.caja.ClickPolicy">
-      <default>'double'</default>
-      <_summary>Type of click used to launch/open files</_summary>
-      <_description>Possible values are "single" to launch files on a single click,  or "double" to launch them on a double click.</_description>
-    </key>
-    <key name="executable-text-activation" enum="org.mate.caja.ActivationChoice">
-      <default>'ask'</default>
-      <_summary>What to do with executable text files when activated</_summary>
-      <_description>What to do with executable text files when they are activated (single or double clicked). Possible values are "launch" to launch them as programs, "ask" to ask what to do via a dialog, and "display" to display them as text files.</_description>
-    </key>
-    <key name="install-mime-activation" type="b">
-      <default>true</default>
-      <_summary>Show the package installer for unknown mime types</_summary>
-      <_description>Whether to show the user a package installer dialog in case an unknown mime type is opened, in order to search for an application to handle it.</_description>
-    </key>
-    <key name="mouse-use-extra-buttons" type="b">
-      <default>true</default>
-      <_summary>Use extra mouse button events in Caja' browser window</_summary>
-      <_description>For users with mice that have "Forward" and "Back" buttons, this key will determine if any action is taken inside of Caja when either is pressed.</_description>
-    </key>
-    <key name="mouse-forward-button" type="i">
-      <default>9</default>
-      <_summary>Mouse button to activate the "Forward" command in browser window</_summary>
-      <_description>For users with mice that have buttons for "Forward" and "Back", this key will set which button activates the "Forward" command in a browser window. Possible values range between 6 and 14.</_description>
-    </key>
-    <key name="mouse-back-button" type="i">
-      <default>8</default>
-      <_summary>Mouse button to activate the "Back" command in browser window</_summary>
-      <_description>For users with mice that have buttons for "Forward" and "Back", this key will set which button activates the "Back" command in a browser window. Possible values range between 6 and 14.</_description>
-    </key>
-    <key name="show-image-thumbnails" enum="org.mate.caja.SpeedTradeoff">
-      <aliases><alias value='local_only' target='local-only'/></aliases>
-      <default>'local-only'</default>
-      <_summary>When to show thumbnails of image files</_summary>
-      <_description>Speed tradeoff for when to show an image file as a thumbnail. If set to "always" then always thumbnail,  even if the folder is on a remote server. If set to "local-only" then only show thumbnails for local file systems. If set to "never" then never bother to thumbnail images, just use a generic icon.</_description>
-    </key>
-    <key name="thumbnail-limit" type="t">
-      <default>10485760</default>
-      <_summary>Maximum image size for thumbnailing</_summary>
-      <_description>Images over this size (in bytes) won't be  thumbnailed. The purpose of this setting is to  avoid thumbnailing large images that may take a long time to load or use lots of memory.</_description>
-    </key>
-    <key name="preview-sound" enum="org.mate.caja.SpeedTradeoff">
-      <aliases><alias value='local_only' target='local-only'/></aliases>
-      <default>'local-only'</default>
-      <_summary>Whether to preview sounds when mousing over an icon</_summary>
-      <_description>Speed tradeoff for when to preview a sound file when mousing over a files icon. If set to "always" then always plays the sound,  even if the file is on a remote server. If set to "local-only" then only plays previews on local file systems. If set to "never" then it never previews sound.</_description>
-    </key>
-    <key name="show-advanced-permissions" type="b">
-      <default>false</default>
-      <_summary>Show advanced permissions in the file property dialog</_summary>
-      <_description>If set to true, then Caja lets you edit and display file permissions in a more unix-like way, accessing some more esoteric options.</_description>
-    </key>
-    <key name="sort-directories-first" type="b">
-      <default>true</default>
-      <_summary>Show folders first in windows</_summary>
-      <_description>If set to true, then Caja shows folders prior to showing files in the icon and list views.</_description>
-    </key>
-    <key name="default-sort-order" enum="org.mate.caja.SortOrder">
-      <aliases>
-        <alias value='modification_date' target='mtime'/>
-      </aliases>
-      <default>'name'</default>
-      <_summary>Default sort order</_summary>
-      <_description>The default sort-order for items in the icon view. Possible values are "name", "size", "type", "mtime", and "emblems".</_description>
-    </key>
-    <key name="default-sort-in-reverse-order" type="b">
-      <default>false</default>
-      <_summary>Reverse sort order in new windows</_summary>
-      <_description>If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from "a" to "z", they will be sorted from "z" to "a"; if sorted by size, instead of being incrementally they will be sorted decrementally.</_description>
-    </key>
-    <key name="desktop-is-home-dir" type="b">
-      <default>false</default>
-      <_summary>Caja uses the users home folder as the desktop</_summary>
-      <_description>If set to true, then Caja will use the user's home folder as the desktop.  If it is false, then it will use ~/Desktop as the desktop.</_description>
-    </key>
-    <key name="background-set" type="b">
-      <default>false</default>
-      <_summary>Custom Background</_summary>
-      <_description>Whether a custom default folder background has been set.</_description>
-    </key>
-    <key name="background-color" type="s">
-      <default>'#ffffff'</default>
-      <_summary>Default Background Color</_summary>
-      <_description>Color for the default folder background.  Only used if background_set is true.</_description>
-    </key>
-    <key name="background-uri" type="s">
-      <default>''</default>
-      <_summary>Default Background Filename</_summary>
-      <_description>Uri of the default folder background.  Only used if background_set is true.</_description>
-    </key>
-    <key name="side-pane-background-set" type="b">
-      <default>false</default>
-      <_summary>Custom Side Pane Background Set</_summary>
-      <_description>Whether a custom default side pane background has been set.</_description>
-    </key>
-    <key name="side-pane-background-color" type="s">
-      <default>'#ffffff'</default>
-      <_summary>Default Side Pane Background Color</_summary>
-      <_description>Filename for the default side pane background.  Only used if side_pane_background_set is true.</_description>
-    </key>
-    <key name="side-pane-background-uri" type="s">
-      <default>""</default>
-      <_summary>Default Side Pane Background Filename</_summary>
-      <_description>Uri of the default side pane background.  Only used if side_pane_background_set is true.</_description>
-    </key>
-    <key name="default-folder-viewer" enum="org.mate.caja.FolderView">
-      <aliases>
-        <alias value='icon_view' target='icon-view'/>
-        <alias value='compact_view' target='compact-view'/>
-        <alias value='list_view' target='list-view'/>
-      </aliases>
-      <default>'icon-view'</default>
-      <_summary>Default folder viewer</_summary>
-      <_description>When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are "list-view", "icon-view" and "compact-view".</_description>
-    </key>
-    <key name="date-format" enum="org.mate.caja.DateFormat">
-      <default>'locale'</default>
-      <_summary>Date Format</_summary>
-      <_description>The format of file dates. Possible values are "locale", "iso", and "informal".</_description>
-    </key>
-    <key name="show-hidden-files" type="b">
-      <default>false</default>
-      <_summary>Whether to show hidden files</_summary>
-      <_description>If set to true, then hidden files are shown by default in the file manager.  Hidden files are either dotfiles, listed in the folder's .hidden file or backup files ending with a tilde (~).</_description>
-    </key>
-    <key name="use-iec-units" type="b">
-      <default>false</default>
-      <_summary>Whether to show file sizes with IEC units</_summary>
-      <_description>If set to true, file sizes are shown using IEC (base 1024) units with "KiB" style suffixes, instead of default with SI units.</_description>
-    </key>
-  </schema>
-
-  <schema id="org.mate.caja.icon-view" path="/org/mate/caja/icon-view/" gettext-domain="caja">
-    <key name="captions" type="as">
-      <default>[ 'none', 'size', 'date_modified' ]</default>
-      <_summary>List of possible captions on icons</_summary>
-      <_description>A list of captions below an icon in the icon view and
-      the desktop.  The actual number of captions shown depends on
-      the zoom level.  Some possible values are:
-      "size", "type", "date_modified", "date_changed", "date_accessed", "owner",
-      "group", "permissions", "octal_permissions" and "mime_type".</_description>
-    </key>
-    <key name="default-use-tighter-layout" type="b">
-      <default>false</default>
-      <_summary>Use tighter layout in new windows</_summary>
-      <_description>If true, icons will be laid out tighter by default in new windows.</_description>
-    </key>
-    <key name="labels-beside-icons" type="b">
-      <default>false</default>
-      <_summary>Put labels beside icons</_summary>
-      <_description>If true, labels will be placed beside icons rather than underneath them.</_description>
-    </key>
-    <key name="default-zoom-level" enum="org.mate.caja.ZoomLevel">
-      <default>'standard'</default>
-      <_summary>Default icon zoom level</_summary>
-      <_description>Default zoom level used by the icon view.</_description>
-    </key>
-    <key name="thumbnail-size" type="i">
-      <default>64</default>
-      <_summary>Default Thumbnail Icon Size</_summary>
-      <_description>The default size of an icon for a thumbnail in the icon view.</_description>
-    </key>
-    <key name="text-ellipsis-limit" type="as">
-      <default>[ '3' ]</default>
-      <_summary>Text Ellipsis Limit</_summary>
-      <_description>A string specifying how parts of overlong file names
-         should be replaced by ellipses, depending on the zoom
-         level.
-         Each of the list entries is of the form "Zoom Level:Integer".
-         For each specified zoom level, if the given integer is
-         larger than 0, the file name will not exceed the given number of lines.
-         If the integer is 0 or smaller, no limit is imposed on the specified zoom level.
-         A default entry of the form "Integer" without any specified zoom level
-         is also allowed. It defines the maximum number of lines for all other zoom levels.
-         Examples:
-         0 - always display overlong file names;
-         3 - shorten file names if they exceed three lines;
-         smallest:5,smaller:4,0 - shorten file names if they exceed five lines
-         for zoom level "smallest". Shorten file names if they exceed four lines
-         for zoom level "smaller". Do not shorten file names for other zoom levels.
-
-         Available zoom levels:
-         smallest (33%), smaller (50%), small (66%), standard (100%), large (150%),
-         larger (200%), largest (400%)</_description>
-    </key>
-  </schema>
-
-  <schema id="org.mate.caja.compact-view" path="/org/mate/caja/compact-view/" gettext-domain="caja">
-    <key name="default-zoom-level" enum="org.mate.caja.ZoomLevel">
-      <default>'standard'</default>
-      <_summary>Default compact view zoom level</_summary>
-      <_description>Default zoom level used by the compact view.</_description>
-    </key>
-    <key name="all-columns-have-same-width" type="b">
-      <default>true</default>
-      <_summary>All columns have same width</_summary>
-      <_description>If this preference is set, all columns in the compact view have the same width. Otherwise, the width of each column is determined seperately.</_description>
-    </key>
-  </schema>
-
-  <schema id="org.mate.caja.list-view" path="/org/mate/caja/list-view/" gettext-domain="caja">
-    <key name="default-zoom-level" enum="org.mate.caja.ZoomLevel">
-      <default>'smaller'</default>
-      <_summary>Default list zoom level</_summary>
-      <_description>Default zoom level used by the list view.</_description>
-    </key>
-    <key name="default-visible-columns" type="as">
-      <default>[ 'name', 'size', 'type', 'date_modified' ]</default>
-      <_summary>Default list of columns visible in the list view</_summary>
-      <_description>Default list of columns visible in the list view.</_description>
-    </key>
-    <key name="default-column-order" type="as">
-      <default>[ 'name', 'size', 'type', 'date_modified' ]</default>
-      <_summary>Default column order in the list view</_summary>
-      <_description>Default column order in the list view.</_description>
-    </key>
-  </schema>
-
-  <schema id="org.mate.caja.sidebar-panels" path="/org/mate/caja/sidebar-panels/" gettext-domain="caja">
-    <child name="tree" schema="org.mate.caja.sidebar-panels.tree"/>
-  </schema>
-
-  <schema id="org.mate.caja.sidebar-panels.tree" path="/org/mate/caja/sidebar-panels/tree/" gettext-domain="caja">
-    <key name="show-only-directories" type="b">
-      <default>true</default>
-      <_summary>Only show folders in the tree side pane</_summary>
-      <_description>If set to true, Caja will only show folders in the tree side pane. Otherwise it will show both folders and files.</_description>
-    </key>
-  </schema>
-
-  <schema id="org.mate.caja.desktop" path="/org/mate/caja/desktop/" gettext-domain="caja">
-    <key name="font" type="s">
-      <default l10n="messages" context="desktop-font">'Sans 10'</default>
-      <_summary>Desktop font</_summary>
-      <_description>The font _description used for the icons on the desktop.</_description>
-    </key>
-    <key name="home-icon-visible" type="b">
-      <default>true</default>
-      <_summary>Home icon visible on desktop</_summary>
-      <_description>If this is set to true, an icon linking to the home folder will be put on the desktop.</_description>
-    </key>
-    <key name="computer-icon-visible" type="b">
-      <default>true</default>
-      <_summary>Computer icon visible on desktop</_summary>
-      <_description>If this is set to true, an icon linking to the computer location will be put on the desktop.</_description>
-    </key>
-    <key name="trash-icon-visible" type="b">
-      <default>true</default>
-      <_summary>Trash icon visible on desktop</_summary>
-      <_description>If this is set to true, an icon linking to the trash will be put on the desktop.</_description>
-    </key>
-    <key name="volumes-visible" type="b">
-      <default>true</default>
-      <_summary>Show mounted volumes on the desktop</_summary>
-      <_description>If this is set to true, icons linking to mounted volumes will be put on the desktop.</_description>
-    </key>
-    <key name="network-icon-visible" type="b">
-      <default>false</default>
-      <_summary>Network Servers icon visible on the desktop</_summary>
-      <_description>If this is set to true, an icon linking to the Network Servers view will be put on the desktop.</_description>
-    </key>
-    <key name="computer-icon-name" type="s">
-      <default>''</default>
-      <_summary>Desktop computer icon name</_summary>
-      <_description>This name can be set if you want a custom name for the computer icon on the desktop.</_description>
-    </key>
-    <key name="home-icon-name" type="s">
-      <default>''</default>
-      <_summary>Desktop home icon name</_summary>
-      <_description>This name can be set if you want a custom name for the home icon on the desktop.</_description>
-    </key>
-    <key name="trash-icon-name" type="s">
-      <default>''</default>
-      <_summary>Desktop trash icon name</_summary>
-      <_description>This name can be set if you want a custom name for the trash icon on the desktop.</_description>
-    </key>
-    <key name="network-icon-name" type="s">
-      <default>''</default>
-      <_summary>Network servers icon name</_summary>
-      <_description>This name can be set if you want a custom name for the network servers icon on the desktop.</_description>
-    </key>
-    <key name="text-ellipsis-limit" type="i">
-      <default>3</default>
-      <_summary>Text Ellipsis Limit</_summary>
-      <_description>An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines.</_description>
-    </key>
-  </schema>
-
-  <schema id="org.mate.caja.window-state" path="/org/mate/caja/window-state/" gettext-domain="caja">
-    <key name="geometry" type="s">
-      <default>''</default>
-      <_summary>The geometry string for a navigation window.</_summary>
-      <_description>A string containing the saved geometry and coordinates string for navigation windows.</_description>
-    </key>
-    <key name="maximized" type="b">
-      <default>false</default>
-      <_summary>Whether the navigation window should be maximized.</_summary>
-      <_description>Whether the navigation window should be maximized by default.</_description>
-    </key>
-    <key name="sidebar-width" type="i">
-      <default>148</default>
-      <_summary>Width of the side pane</_summary>
-      <_description>The default width of the side pane in new windows.</_description>
-    </key>
-    <key name="start-with-toolbar" type="b">
-      <default>true</default>
-      <_summary>Show toolbar in new windows</_summary>
-      <_description>If set to true, newly opened windows will have toolbars visible.</_description>
-    </key>
-    <key name="start-with-location-bar" type="b">
-      <default>true</default>
-      <_summary>Show location bar in new windows</_summary>
-      <_description>If set to true, newly opened windows will have the location bar visible.</_description>
-    </key>
-    <key name="start-with-status-bar" type="b">
-      <default>true</default>
-      <_summary>Show status bar in new windows</_summary>
-      <_description>If set to true, newly opened windows will have the status bar visible.</_description>
-    </key>
-    <key name="start-with-sidebar" type="b">
-      <default>true</default>
-      <_summary>Show side pane in new windows</_summary>
-      <_description>If set to true, newly opened windows will have the side pane visible.</_description>
-    </key>
-    <key name="side-pane-view" type="s">
-      <choices>
-    <choice value='emblems'/>
-    <choice value='history'/>
-    <choice value='information'/>
-    <choice value='notes'/>
-    <choice value='places'/>
-    <choice value='tree'/>
-      </choices>
-      <aliases>
-    <alias value='CajaEmblemSidebar' target='emblems'/>
-    <alias value='CajaHistorySidebar' target='history'/>
-    <alias value='CajaInformationPanel' target='information'/>
-    <alias value='CajaNotesSidebar' target='notes'/>
-    <alias value='CajaPlacesSidebar' target='places'/>
-    <alias value='CajaTreeSidebar' target='tree'/>
-      </aliases>
-      <default>'places'</default>
-      <_summary>Side pane view</_summary>
-      <_description>The side pane view to show in newly opened windows.</_description>
-    </key>
-  </schema>
-
-  <schema path="/org/mate/caja/extensions/" id="org.mate.caja.extensions" gettext-domain="caja">
-    <key type="as" name="disabled-extensions">
-      <default>[  ]</default>
-      <summary>List of extensions in disabled state.</summary>
-      <description>This list contains the extensions that are currently de-activated.</description>
-    </key>
-  </schema>
-
-</schemalist>
diff --git a/libcaja-private/org.mate.media-handling.gschema.xml b/libcaja-private/org.mate.media-handling.gschema.xml
new file mode 100644
index 00000000..214c3a92
--- /dev/null
+++ b/libcaja-private/org.mate.media-handling.gschema.xml
@@ -0,0 +1,34 @@
+<schemalist>
+  <schema id="org.mate.media-handling" path="/org/mate/desktop/media-handling/" gettext-domain="caja">
+    <key name="automount" type="b">
+      <default>true</default>
+      <summary>Whether to automatically mount media</summary>
+      <description>If set to true, then Caja 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 Caja 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 Caja 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/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/libcaja-private/org.mate.media-handling.gschema.xml.in b/libcaja-private/org.mate.media-handling.gschema.xml.in
deleted file mode 100644
index 25f81b14..00000000
--- a/libcaja-private/org.mate.media-handling.gschema.xml.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<schemalist>
-  <schema id="org.mate.media-handling" path="/org/mate/desktop/media-handling/" gettext-domain="caja">
-    <key name="automount" type="b">
-      <default>true</default>
-      <_summary>Whether to automatically mount media</_summary>
-      <_description>If set to true, then Caja 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 Caja 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 Caja 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/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/po/POTFILES.in b/po/POTFILES.in
index 2617280e..ab030517 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,8 +46,8 @@ libcaja-private/caja-search-directory-file.c
 libcaja-private/caja-tree-view-drag-dest.c
 libcaja-private/caja-undostack-manager.c
 libcaja-private/caja-vfs-file.c
-libcaja-private/org.mate.caja.gschema.xml.in
-libcaja-private/org.mate.media-handling.gschema.xml.in
+[type: gettext/gsettings]libcaja-private/org.mate.caja.gschema.xml
+[type: gettext/gsettings]libcaja-private/org.mate.media-handling.gschema.xml
 data/caja-autorun-software.desktop.in.in
 data/caja-browser.desktop.in.in
 data/caja-computer.desktop.in.in