[vinagre] Make GSettings schema translatable, bug 643659

[David King <davidk src gnome org>]

commit 7e1d0925a41c18cd53a995bb51b747ce35c37d61
Author: Chris Kühl <chrisk openismus com>
Date:   Wed Mar 2 13:37:38 2011 +0100

    Make GSettings schema translatable, bug 643659

 data/.gitignore                       |    2 +
 data/Makefile.am                      |   21 ++++++++++++++++---
 data/org.gnome.Vinagre.gschema.xml    |   35 ---------------------------------
 data/org.gnome.Vinagre.gschema.xml.in |   35 +++++++++++++++++++++++++++++++++
 po/POTFILES.in                        |    1 +
 5 files changed, 55 insertions(+), 39 deletions(-)
---
diff --git a/data/.gitignore b/data/.gitignore
index 3ee935c..cf60c54 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -19,6 +19,8 @@
 /TAGS
 /_libs
 /org.freedesktop.Telepathy.Client.Vinagre.service
+/org.gnome.Vinagre.gschema.valid
+/org.gnome.Vinagre.gschema.xml
 /so_locations
 /tags
 /vinagre-1.0.pc
diff --git a/data/Makefile.am b/data/Makefile.am
index 7cd3e61..0e90f5c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,12 +21,23 @@ MIMEFILES = vinagre-mime.xml.in
 mimedir = $(datadir)/mime/packages
 mime_DATA = vinagre-mime.xml
 
-gsettings_SCHEMAS = org.gnome.Vinagre.gschema.xml
+gsettings_in_file = org.gnome.Vinagre.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+# @INTLTOOL_XML_NOMERGE_RULE@ # This rule is overriden by the above
+                              # INTLTOOL_XML_RULE macro.
+# Here is the workaround. Could break if intltools changes arguments.
+$(gsettings_SCHEMAS): $(gsettings_in_file)
+	$(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@
+
 @GSETTINGS_RULES@
 
+dist_noinst_DATA = \
+	$(gsettings_in_file)
+
 CLEANFILES = \
 	$(desktop_DATA) \
 	$(mime_DATA) \
+	$(gsettings_SCHEMAS) \
 	$(pkgconfig_DATA) \
 	org.freedesktop.Telepathy.Client.Vinagre.service
 
@@ -36,7 +47,7 @@ EXTRA_DIST = \
 	$(ui_DATA) \
 	$(desktop_in_files) \
 	$(MIMEFILES) \
-	$(gsettings_SCHEMAS) \
+	$(gsettings_in_files) \
 	vinagre.pc.in \
 	Vinagre.client \
 	org.freedesktop.Telepathy.Client.Vinagre.service.in
@@ -69,12 +80,14 @@ UPDATE_DESKTOP = \
                 fi \
         fi
 
-install-data-hook: 
+install-data-hook:
 	$(UPDATE_MIME)
 	$(UPDATE_DESKTOP)
 
-uninstall-hook: 
+uninstall-hook:
 	$(UPDATE_MIME)
 	$(UPDATE_DESKTOP)
 
 -include $(top_srcdir)/git.mk
+
+MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
diff --git a/data/org.gnome.Vinagre.gschema.xml.in b/data/org.gnome.Vinagre.gschema.xml.in
new file mode 100644
index 0000000..ccc2684
--- /dev/null
+++ b/data/org.gnome.Vinagre.gschema.xml.in
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.gnome.Vinagre" path="/org/gnome/vinagre/">
+    <key name="shared-flag" type="b">
+      <default>true</default>
+      <_summary>Whether we should leave other clients connected</_summary>
+      <_description>When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients.</_description>
+    </key>
+    <key name="always-show-tabs" type="b">
+      <default>false</default>
+      <_summary>Whether we should show tabs even when there is only one active connection</_summary>
+      <_description>Set to "true" to always show the tabs. Set to "false" to only show the tabs when there is more than one active connection.</_description>
+    </key>
+    <key name="show-accels" type="b">
+      <default>false</default>
+      <_summary>Whether we should show the menu accelerators (shortcut keys)</_summary>
+      <_description>Set to "false" to disable menu shortcuts. Set to "true" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host.</_description>
+    </key>
+    <key name="history-size" type="i">
+      <default>15</default>
+      <_summary>Maximum number of history items in connect dialog</_summary>
+      <_description>Specifies the maximum number of items in the host dropdown entry.</_description>
+    </key>
+    <key name="always-enable-listening" type="b">
+      <default>false</default>
+      <_summary>Whether we should start the program listening for reverse connections</_summary>
+      <_description>Set to "true" to always start the program listening for reverse connections.</_description>
+    </key>
+    <key name="active-plugins" type="as">
+      <default>[ 'vnc' ]</default>
+      <_summary>Active plugins</_summary>
+      <_description>List of active plugins. It contains the "Location" of the active plugins. See the .vinagre-plugin file for obtaining the "Location" of a given plugin.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6a21103..ba5a2ab 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
 # List of source files containing translatable strings.
 
 data/GNOME_VinagreApplet.xml
+data/org.gnome.Vinagre.gschema.xml.in
 data/vinagre.desktop.in.in
 data/vinagre-file.desktop.in.in
 [type: gettext/glade]data/vinagre.ui