From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 23 Sep 2012 15:23:29 +0000 (-0400)
Subject: Update GConf migration guide
X-Git-Tag: 2.34.0~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=580b58c3c0be3422c39925912e2282a917c96c8b;p=platform%2Fupstream%2Fglib.git

Update GConf migration guide

Newer intltool makes this much easier. Yay
https://bugzilla.gnome.org/show_bug.cgi?id=674620
---

diff --git a/docs/reference/gio/migrating-gconf.xml b/docs/reference/gio/migrating-gconf.xml
index 44e4e32..413c10f 100644
--- a/docs/reference/gio/migrating-gconf.xml
+++ b/docs/reference/gio/migrating-gconf.xml
@@ -357,14 +357,12 @@ gsettings_SCHEMAS = my.app.gschema.xml
         Translations for these strings will also be handled
         via gettext, so you should arrange for these strings to be
         extracted into your gettext catalog. One way to do that is to use
-        intltool. For that, you use <tag class="starttag">_summary</tag>
-        and <tag class="starttag">_description</tag> elements in a
-        .gschema.xml.in file and use
-        <literal>@<!-- -->INTLTOOL_XML_NOMERGE_RULE<!-- -->@</literal>
-        in your Makefile.am to produce the .gschema.xml file. The
-        <literal>NOMERGE</literal> part of the rule instructs intltool
-        to extract translatable strings, but not merge the translations
-        back into the generated xml file.
+        intltool. Since intltool 0.50.1, schema files are
+        supported, so all you have to do is to add your .gschema.xml
+        files to <filename>POTFILES.in</filename> with a line like
+        <programlisting>
+        [type: gettext/gsettings]data/org.foo.MyApp.gschema.xml
+        </programlisting>
       </para>
       <para>
         GSettings is a bit more restrictive about key names than GConf. Key