Merge pull request #83 from monsta/master

fixes for gschema translation

3 files changed, 147 insertions, 152 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 9a52d83..17331e2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -20,9 +20,6 @@ gsettings_ENUM_FILES = $(top_srcdir)/src/eom-scroll-view.h	\
 gsettings_SCHEMAS = org.mate.eom.gschema.xml
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 convertdir = $(datadir)/MateConf/gsettings
 convert_DATA = eom.convert
 
@@ -40,20 +37,18 @@ pkgconfig_DATA = eom.pc
 gtkrcdir = $(pkgdatadir)
 gtkrc_DATA = gtkrc
 
-EXTRA_DIST =				\
+EXTRA_DIST =					\
         $(gtkrc_DATA)			\
-        $(ui_DATA)			\
-	$(convert_DATA)			\
+        $(ui_DATA)				\
+        $(convert_DATA)			\
         $(DESKTOP_IN_FILES)		\
-	$(appdata_in_files)		\
-        $(gsettings_SCHEMAS).in.in
+        $(appdata_in_files)
 
-CLEANFILES = 			\
-	eom.appdata.xml
+CLEANFILES = 					\
+        $(appdata_DATA)
 
-DISTCLEANFILES = 		\
-        $(DESKTOP_FILES)	\
-        $(gsettings_SCHEMAS_in)	\
-	$(gsettings_SCHEMAS)
+DISTCLEANFILES = 				\
+        $(DESKTOP_FILES)		\
+        $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/org.mate.eom.gschema.xml.in b/data/org.mate.eom.gschema.xml.in
new file mode 100644
index 0000000..92c430b
--- /dev/null
+++ b/data/org.mate.eom.gschema.xml.in
@@ -0,0 +1,138 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.eom" path="/org/mate/eom/">
+    <child name="view" schema="org.mate.eom.view"/>
+    <child name="full-screen" schema="org.mate.eom.full-screen"/>
+    <child name="ui" schema="org.mate.eom.ui"/>
+    <child name="plugins" schema="org.mate.eom.plugins"/>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.eom.view" path="/org/mate/eom/view/">
+    <key name="autorotate" type="b">
+      <default>true</default>
+      <summary>Automatic orientation</summary>
+      <description>Whether the image should be rotated automatically based on EXIF orientation.</description>
+    </key>
+    <key name="background-color" type="s">
+      <default>'#000000'</default>
+      <summary>Background Color</summary>
+      <description>The color that is used to fill the area behind the image. If the use-background-color key is not set, the color is determined by the active GTK+ theme instead.</description>
+    </key>
+    <key name="use-background-color" type="b">
+      <default>true</default>
+      <summary>Use a custom background color</summary>
+      <description>If this is active, the color set by the background-color key will be used to fill the area behind the image. If it is not set, the current GTK+ theme will determine the fill color.</description>
+    </key>
+    <key name="interpolate" type="b">
+      <default>true</default>
+      <summary>Interpolate Image</summary>
+      <description>Whether the image should be interpolated on zoom-out. This leads to better quality but is somewhat slower than non-interpolated images.</description>
+    </key>
+    <key name="extrapolate" type="b">
+      <default>true</default>
+      <summary>Extrapolate Image</summary>
+      <description>Whether the image should be extrapolated on zoom-in. This leads to blurry quality and is somewhat slower than non-extrapolated images.</description>
+    </key>
+    <key name="transparency" enum="org.mate.eom.EomTransparencyStyle">
+      <default>'checked'</default>
+      <summary>Transparency indicator</summary>
+      <description>Determines how transparency should be indicated. Valid values are checked, color and none. If color is chosen, then the trans-color key determines the color value used.</description>
+    </key>
+    <key name="scroll-wheel-zoom" type="b">
+      <default>true</default>
+      <summary>Scroll wheel zoom</summary>
+      <description>Whether the scroll wheel should be used for zooming.</description>
+    </key>
+    <key name="zoom-multiplier" type="d">
+      <default>0.05</default>
+      <summary>Zoom multiplier</summary>
+      <description>The multiplier to be applied when using the mouse scroll wheel  for zooming. This value defines the zooming step used for each scroll  event. For example, 0.05 results in a 5% zoom increment for each  scroll event and 1.00 result in a 100% zoom increment.</description>
+    </key>
+    <key name="trans-color" type="s">
+      <default>'#000000'</default>
+      <summary>Transparency color</summary>
+      <description>If the transparency key has the value COLOR, then this  key determines the color which is used for indicating transparency.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.eom.full-screen" path="/org/mate/eom/full-screen/">
+    <key name="random" type="b">
+      <default>false</default>
+      <summary>Randomize the image sequence</summary>
+      <description>Whether the sequence of images should be shown in an random loop.</description>
+    </key>
+    <key name="loop" type="b">
+      <default>true</default>
+      <summary>Loop through the image sequence</summary>
+      <description>Whether the sequence of images should be shown in an endless loop.</description>
+    </key>
+    <key name="upscale" type="b">
+      <default>true</default>
+      <summary>Allow zoom greater than 100% initially</summary>
+      <description>If this is set to FALSE small images will not be stretched to fit into the screen initially.</description>
+    </key>
+    <key name="seconds" type="i">
+      <default>5</default>
+      <summary>Delay in seconds until showing the next image</summary>
+      <description>A value greater than 0 determines the seconds an image stays on screen until the next one is shown automatically. Zero  disables the automatic browsing.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.eom.ui" path="/org/mate/eom/ui/">
+    <key name="toolbar" type="b">
+      <default>true</default>
+      <summary>Show/Hide the window toolbar.</summary>
+    </key>
+    <key name="statusbar" type="b">
+      <default>true</default>
+      <summary>Show/Hide the window statusbar.</summary>
+    </key>
+    <key name="image-collection" type="b">
+      <default>false</default>
+      <summary>Show/Hide the image collection pane.</summary>
+    </key>
+    <key name="image-collection-position" enum="org.mate.eom.EomWindowCollectionPos">
+      <default>'bottom'</default>
+      <summary>Image collection pane position.</summary>
+    </key>
+    <key name="image-collection-resizable" type="b">
+      <default>false</default>
+      <summary>Whether the image collection pane should be resizable.</summary>
+    </key>
+    <key name="sidebar" type="b">
+      <default>true</default>
+      <summary>Show/Hide the window side pane.</summary>
+    </key>
+    <key name="scroll-buttons" type="b">
+      <default>true</default>
+      <summary>Show/Hide the image collection pane scroll buttons.</summary>
+    </key>
+    <key name="disable-close-confirmation" type="b">
+      <default>false</default>
+      <summary>Close main window without asking to save changes.</summary>
+    </key>
+    <key name="disable-trash-confirmation" type="b">
+      <default>false</default>
+      <summary>Trash images without asking</summary>
+      <description>If activated, Eye of MATE won't ask for confirmation when moving images to the trash. It will still ask if any of the files cannot be moved to the trash and would be deleted instead.</description>
+    </key>
+    <key name="propsdialog-netbook-mode" type="b">
+      <default>true</default>
+      <summary>Whether the metadata list in the properties dialog should have its own page.</summary>
+      <description>If activated, the detailed metadata list in the properties dialog will be moved to its own page in the dialog. This should make the dialog more usable on smaller screens, e.g. as used by netbooks. If disabled, the widget will be embedded on the "Metadata" page.</description>
+    </key>
+    <key name="external-editor" type="s">
+      <default>''</default>
+      <summary>External program to use for editing images</summary>
+      <description>The desktop file name (including the ".desktop") of the application to use for editing images (when the "Edit Image" toolbar button is clicked). Set to the empty string to disable this feature.</description>
+    </key>
+    <key name="filechooser-xdg-fallback" type="b">
+      <default>true</default>
+      <summary>Whether the file chooser should show the user's pictures folder if no images are loaded.</summary>
+      <description>If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up, it will show the current working directory.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.eom.plugins" path="/org/mate/eom/plugins/">
+    <key name="active-plugins" type="as">
+      <default>[]</default>
+      <summary>Active plugins</summary>
+      <description>List of active plugins. It doesn't contain the "Location" of the active plugins.  See the .eom-plugin file for obtaining the "Location" of a given plugin.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.eom.gschema.xml.in.in b/data/org.mate.eom.gschema.xml.in.in
deleted file mode 100644
index de8c94f..0000000
--- a/data/org.mate.eom.gschema.xml.in.in
+++ /dev/null
@@ -1,138 +0,0 @@
-<schemalist>
-  <schema id="org.mate.eom" path="/org/mate/eom/">
-    <child name="view" schema="org.mate.eom.view"/>
-    <child name="full-screen" schema="org.mate.eom.full-screen"/>
-    <child name="ui" schema="org.mate.eom.ui"/>
-    <child name="plugins" schema="org.mate.eom.plugins"/>
-  </schema>
-  <schema id="org.mate.eom.view" path="/org/mate/eom/view/">
-    <key name="autorotate" type="b">
-      <default>true</default>
-      <_summary>Automatic orientation</_summary>
-      <_description>Whether the image should be rotated automatically based on EXIF orientation.</_description>
-    </key>
-    <key name="background-color" type="s">
-      <default>'#000000'</default>
-      <_summary>Background Color</_summary>
-      <_description>The color that is used to fill the area behind the image. If the use-background-color key is not set, the color is determined by the active GTK+ theme instead.</_description>
-    </key>
-    <key name="use-background-color" type="b">
-      <default>true</default>
-      <_summary>Use a custom background color</_summary>
-      <_description>If this is active, the color set by the background-color key will be used to fill the area behind the image. If it is not set, the current GTK+ theme will determine the fill color.</_description>
-    </key>
-    <key name="interpolate" type="b">
-      <default>true</default>
-      <_summary>Interpolate Image</_summary>
-      <_description>Whether the image should be interpolated on zoom-out. This leads to better quality but is somewhat slower than non-interpolated images.</_description>
-    </key>
-    <key name="extrapolate" type="b">
-      <default>true</default>
-      <_summary>Extrapolate Image</_summary>
-      <_description>Whether the image should be extrapolated on zoom-in. This leads to blurry quality and is somewhat slower than non-extrapolated images.</_description>
-    </key>
-    <key name="transparency" enum="org.mate.eom.EomTransparencyStyle">
-      <default>'checked'</default>
-      <_summary>Transparency indicator</_summary>
-      <_description>Determines how transparency should be indicated. Valid values are checked, color and none. If color is chosen, then the trans-color key determines the color value used.</_description>
-    </key>
-    <key name="scroll-wheel-zoom" type="b">
-      <default>true</default>
-      <_summary>Scroll wheel zoom</_summary>
-      <_description>Whether the scroll wheel should be used for zooming.</_description>
-    </key>
-    <key name="zoom-multiplier" type="d">
-      <default>0.05</default>
-      <_summary>Zoom multiplier</_summary>
-      <_description>The multiplier to be applied when using the mouse scroll wheel  for zooming. This value defines the zooming step used for each scroll  event. For example, 0.05 results in a 5% zoom increment for each  scroll event and 1.00 result in a 100% zoom increment.</_description>
-    </key>
-    <key name="trans-color" type="s">
-      <default>'#000000'</default>
-      <_summary>Transparency color</_summary>
-      <_description>If the transparency key has the value COLOR, then this  key determines the color which is used for indicating transparency.</_description>
-    </key>
-  </schema>
-  <schema id="org.mate.eom.full-screen" path="/org/mate/eom/full-screen/">
-    <key name="random" type="b">
-      <default>false</default>
-      <_summary>Randomize the image sequence</_summary>
-      <_description>Whether the sequence of images should be shown in an random loop.</_description>
-    </key>
-    <key name="loop" type="b">
-      <default>true</default>
-      <_summary>Loop through the image sequence</_summary>
-      <_description>Whether the sequence of images should be shown in an endless loop.</_description>
-    </key>
-    <key name="upscale" type="b">
-      <default>true</default>
-      <_summary>Allow zoom greater than 100% initially</_summary>
-      <_description>If this is set to FALSE small images will not be stretched to fit into the screen initially.</_description>
-    </key>
-    <key name="seconds" type="i">
-      <default>5</default>
-      <_summary>Delay in seconds until showing the next image</_summary>
-      <_description>A value greater than 0 determines the seconds an image stays on screen until the next one is shown automatically. Zero  disables the automatic browsing.</_description>
-    </key>
-  </schema>
-  <schema id="org.mate.eom.ui" path="/org/mate/eom/ui/">
-    <key name="toolbar" type="b">
-      <default>true</default>
-      <_summary>Show/Hide the window toolbar.</_summary>
-    </key>
-    <key name="statusbar" type="b">
-      <default>true</default>
-      <_summary>Show/Hide the window statusbar.</_summary>
-    </key>
-    <key name="image-collection" type="b">
-      <default>false</default>
-      <_summary>Show/Hide the image collection pane.</_summary>
-    </key>
-    <key name="image-collection-position" enum="org.mate.eom.EomWindowCollectionPos">
-      <default>'bottom'</default>
-      <_summary>Image collection pane position.</_summary>
-    </key>
-    <key name="image-collection-resizable" type="b">
-      <default>false</default>
-      <_summary>Whether the image collection pane should be resizable.</_summary>
-    </key>
-    <key name="sidebar" type="b">
-      <default>true</default>
-      <_summary>Show/Hide the window side pane.</_summary>
-    </key>
-    <key name="scroll-buttons" type="b">
-      <default>true</default>
-      <_summary>Show/Hide the image collection pane scroll buttons.</_summary>
-    </key>
-    <key name="disable-close-confirmation" type="b">
-      <default>false</default>
-      <_summary>Close main window without asking to save changes.</_summary>
-    </key>
-    <key name="disable-trash-confirmation" type="b">
-      <default>false</default>
-      <_summary>Trash images without asking</_summary>
-      <_description>If activated, Eye of MATE won't ask for confirmation when moving images to the trash. It will still ask if any of the files cannot be moved to the trash and would be deleted instead.</_description>
-    </key>
-    <key name="propsdialog-netbook-mode" type="b">
-      <default>true</default>
-      <_summary>Whether the metadata list in the properties dialog should have its own page.</_summary>
-      <_description>If activated, the detailed metadata list in the properties dialog will be moved to its own page in the dialog. This should make the dialog more usable on smaller screens, e.g. as used by netbooks. If disabled, the widget will be embedded on the "Metadata" page.</_description>
-    </key>
-    <key name="external-editor" type="s">
-      <default>''</default>
-      <_summary>External program to use for editing images</_summary>
-      <_description>The desktop file name (including the ".desktop") of the application to use for editing images (when the "Edit Image" toolbar button is clicked). Set to the empty string to disable this feature.</_description>
-    </key>
-    <key name="filechooser-xdg-fallback" type="b">
-      <default>true</default>
-      <_summary>Whether the file chooser should show the user's pictures folder if no images are loaded.</_summary>
-      <_description>If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up, it will show the current working directory.</_description>
-    </key>
-  </schema>
-  <schema id="org.mate.eom.plugins" path="/org/mate/eom/plugins/">
-    <key name="active-plugins" type="as">
-      <default>[]</default>
-      <_summary>Active plugins</_summary>
-      <_description>List of active plugins. It doesn't contain the "Location" of the active plugins.  See the .eom-plugin file for obtaining the "Location" of a given plugin.</_description>
-    </key>
-  </schema>
-</schemalist>