[gnome-calculator] Rely on intltool >=0.50 for gsettings translation

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d8fe4376087c34e88088c45167f54d0038d58645
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Oct 5 21:17:32 2013 -0500

    Rely on intltool >=0.50 for gsettings translation

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    6 +--
 ...ema.xml.in => org.gnome.calculator.gschema.xml} |   48 ++++++++++----------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 28 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 60bd091..89b3b9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50])
 AC_SUBST(GETTEXT_PACKAGE, gnome-calculator)
 
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index ccc4d26..4e3813a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,4 @@
 gsettings_SCHEMAS = org.gnome.calculator.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 Utilitiesdir = $(datadir)/applications
@@ -22,7 +21,7 @@ EXTRA_DIST = \
        buttons-programming.ui \
        menu.ui \
        gnome-calculator.gresource.xml \
-       org.gnome.calculator.gschema.xml.in \
+       org.gnome.calculator.gschema.xml \
        gcalctool.desktop.in \
        $(man1_MANS)
 
@@ -31,5 +30,4 @@ CLEANFILES = \
 
 DISTCLEANFILES = \
        Makefile.in \
-       gcalctool.desktop \
-       $(gsettings_SCHEMAS)
+       gcalctool.desktop
diff --git a/data/org.gnome.calculator.gschema.xml.in b/data/org.gnome.calculator.gschema.xml
similarity index 57%
rename from data/org.gnome.calculator.gschema.xml.in
rename to data/org.gnome.calculator.gschema.xml
index 34a80a5..ee6684f 100644
--- a/data/org.gnome.calculator.gschema.xml.in
+++ b/data/org.gnome.calculator.gschema.xml
@@ -22,65 +22,65 @@
     <key type="i" name="accuracy">
       <default>9</default>
       <range min="0" max="9"/>
-      <_summary>Accuracy value</_summary>
-      <_description>The number of digits displayed after the numeric point</_description>
+      <summary>Accuracy value</summary>
+      <description>The number of digits displayed after the numeric point</description>
     </key>
     <key type="i" name="word-size">
       <default>64</default>
       <range min="8" max="64"/>
-      <_summary>Word size</_summary>
-      <_description>The size of the words used in bitwise operations</_description>
+      <summary>Word size</summary>
+      <description>The size of the words used in bitwise operations</description>
     </key>
     <key type="i" name="base">
       <default>10</default>
       <range min="2" max="16"/>
-      <_summary>Numeric Base</_summary>
-      <_description>The numeric base</_description>
+      <summary>Numeric Base</summary>
+      <description>The numeric base</description>
     </key>
     <key type="b" name="show-thousands">
       <default>false</default>
-      <_summary>Show Thousands Separators</_summary>
-      <_description>Indicates whether thousands separators are shown in large numbers.</_description>
+      <summary>Show Thousands Separators</summary>
+      <description>Indicates whether thousands separators are shown in large numbers.</description>
     </key>
     <key type="b" name="show-zeroes">
       <default>false</default>
-      <_summary>Show Trailing Zeroes</_summary>
-      <_description>Indicates whether any trailing zeroes after the  numeric point should be shown in the 
display value.</_description>
+      <summary>Show Trailing Zeroes</summary>
+      <description>Indicates whether any trailing zeroes after the  numeric point should be shown in the 
display value.</description>
     </key>
     <key name="number-format" enum="org.gnome.calculator.NumberFormat">
       <default>'automatic'</default>
-      <_summary>Number format</_summary>
-      <_description>The format to display numbers in</_description>
+      <summary>Number format</summary>
+      <description>The format to display numbers in</description>
     </key>
     <key name="angle-units" enum="org.gnome.calculator.AngleUnit">
       <default>'degrees'</default>
-      <_summary>Angle units</_summary>
-      <_description>The angle units to use</_description>
+      <summary>Angle units</summary>
+      <description>The angle units to use</description>
     </key>
     <key name="button-mode" enum="org.gnome.calculator.ButtonMode">
       <default>'basic'</default>
-      <_summary>Button mode</_summary>
-      <_description>The button mode</_description>
+      <summary>Button mode</summary>
+      <description>The button mode</description>
     </key>
     <key type="s" name="source-currency">
       <default>''</default>
-      <_summary>Source currency</_summary>
-      <_description>Currency of the current calculation</_description>
+      <summary>Source currency</summary>
+      <description>Currency of the current calculation</description>
     </key>
     <key type="s" name="target-currency">
       <default>''</default>
-      <_summary>Target currency</_summary>
-      <_description>Currency to convert the current calculation into</_description>
+      <summary>Target currency</summary>
+      <description>Currency to convert the current calculation into</description>
     </key>
     <key type="s" name="source-units">
       <default>'degree'</default>
-      <_summary>Source units</_summary>
-      <_description>Units of the current calculation</_description>
+      <summary>Source units</summary>
+      <description>Units of the current calculation</description>
     </key>
     <key type="s" name="target-units">
       <default>'radian'</default>
-      <_summary>Target units</_summary>
-      <_description>Units to convert the current calculation into</_description>
+      <summary>Target units</summary>
+      <description>Units to convert the current calculation into</description>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 97f04b1..23641c0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,7 @@
 [type: gettext/glade]data/menu.ui
 data/gcalctool.desktop.in
 data/gnome-calculator.appdata.xml.in
-data/org.gnome.calculator.gschema.xml.in
+data/org.gnome.calculator.gschema.xml
 src/currency.vala
 src/equation-lexer.vala
 src/equation-parser.vala