[gcalctool] Make GConf schemas translatable (Robert Ancell, Bug #571948)

[Robert Ancell <rancell src gnome org>]

commit df9cc31994c69ead645479998b2db684abd076e3
Author: Robert Ancell <robert ancell gmail com>
Date:   Mon May 4 09:49:55 2009 +1000

    Make GConf schemas translatable (Robert Ancell, Bug #571948)
---
 ChangeLog                                        |    4 +++
 data/Makefile.am                                 |   13 ++++++-----
 data/{gcalctool.schemas => gcalctool.schemas.in} |   26 +++++++++++-----------
 po/POTFILES.in                                   |    3 +-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81a01f8..6004fcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 gcalctool change history.
 =========================
 
+2009-05-04 Robert Ancell <robert ancell gmail com>
+
+    * Make GConf schemas translatable (Robert Ancell, Bug #571948)
+
 2009-04-20 Robert Ancell <robert ancell gmail com>
 
     * Fix missing license text in about dialog (Robert Ancell, Bug #579174)
diff --git a/data/Makefile.am b/data/Makefile.am
index a032911..935fd9f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,17 +2,18 @@ uidir = $(datadir)/gcalctool
 ui_DATA = \
 	gcalctool.ui \
 	financial.ui
-	
-SCHEMAS_FILE = gcalctool.schemas
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(SCHEMAS_FILE)
+
+schemadir   = @GCONF_SCHEMA_FILE_DIR@
+schema_in_files = gcalctool.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+ INTLTOOL_SCHEMAS_RULE@
 
 Utilitiesdir = $(datadir)/applications
 Utilities_in_files = gcalctool.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(ui_DATA) $(schema_DATA) gcalctool.desktop.in
+EXTRA_DIST = $(ui_DATA) $(schema_in_files) gcalctool.desktop.in
 
 if GCONF_SCHEMAS_INSTALL
 # Install the gcalctool schema file.
@@ -20,4 +21,4 @@ install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif
 
-DISTCLEANFILES = gcalctool.desktop
+DISTCLEANFILES = gcalctool.desktop $(schema_DATA)
diff --git a/data/gcalctool.schemas b/data/gcalctool.schemas.in
similarity index 92%
rename from data/gcalctool.schemas
rename to data/gcalctool.schemas.in
index e71609a..b1975ae 100644
--- a/data/gcalctool.schemas
+++ b/data/gcalctool.schemas.in
@@ -19,8 +19,8 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <key>/schemas/apps/gcalctool/accuracy</key>
       <owner>gcalctool</owner>
       <type>string</type>
+      <default>9</default>
       <locale name="C">
-        <default>9</default>
         <short>Accuracy value</short>
         <long>
           The number of digits displayed after the numeric point.
@@ -33,8 +33,8 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <key>/schemas/apps/gcalctool/base</key>
       <owner>gcalctool</owner>
       <type>string</type>
+      <default>DEC</default>
       <locale name="C">
-        <default>DEC</default>
         <short>Numeric Base</short>
         <long>
           The initial numeric base. Valid values are 
@@ -49,9 +49,9 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <applyto>/apps/gcalctool/display</applyto> 
       <key>/schemas/apps/gcalctool/display</key> 
       <owner>gcalctool</owner> 
-      <type>string</type> 
+      <type>string</type>
+      <default>FIX</default> 
       <locale name="C"> 
-        <default>FIX</default> 
         <short>Display Mode</short> 
         <long> 
           The initial display mode. Valid values are
@@ -66,8 +66,8 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <key>/schemas/apps/gcalctool/mode</key>
       <owner>gcalctool</owner>
       <type>string</type>
+      <default>BASIC</default>
       <locale name="C"> 
-        <default>BASIC</default>
         <short>Mode</short>
         <long> 
           The initial calculator mode. Valid values are
@@ -83,8 +83,8 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <key>/schemas/apps/gcalctool/showzeroes</key>
       <owner>gcalctool</owner>
       <type>string</type>
+      <default>false</default>
       <locale name="C">
-        <default>false</default>
         <short>Show Trailing Zeroes</short>
         <long>
           Indicates whether any trailing zeroes after the 
@@ -96,9 +96,9 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <applyto>/apps/gcalctool/showhelp</applyto> 
       <key>/schemas/apps/gcalctool/showhelp</key> 
       <owner>gcalctool</owner> 
-      <type>string</type> 
+      <type>string</type>
+      <default>false</default> 
       <locale name="C">  
-        <default>false</default> 
         <short>Show Help</short> 
         <long>  
           Indicates whether tooltip help should be enabled.
@@ -110,8 +110,8 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <key>/schemas/apps/gcalctool/showregisters</key>
       <owner>gcalctool</owner>
       <type>string</type>
+      <default>false</default>
       <locale name="C">
-        <default>false</default>
         <short>Show Registers</short>
         <long>
           Indicates whether the memory register window is 
@@ -124,8 +124,8 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <key>/schemas/apps/gcalctool/righthanded</key>
       <owner>gcalctool</owner>
       <type>string</type>
+      <default>true</default>
       <locale name="C">
-        <default>true</default>
         <short>Right Handed</short>
         <long>
           Indicates whether the calculator is started with a
@@ -137,9 +137,9 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <applyto>/apps/gcalctool/trigtype</applyto> 
       <key>/schemas/apps/gcalctool/trigtype</key> 
       <owner>gcalctool</owner> 
-      <type>string</type> 
+      <type>string</type>
+      <default>DEG</default> 
       <locale name="C"> 
-        <default>DEG</default> 
         <short>Trigonometric type</short> 
         <long> 
           The initial trigonometric type. Valid values are
@@ -154,8 +154,8 @@ To change the gconftool target use the - -config-source=blah option to gconftool
       <key>/schemas/apps/gcalctool/beep</key>
       <owner>gcalctool</owner>
       <type>string</type>
+      <default>true</default>
       <locale name="C">
-        <default>true</default>
         <short>Beep</short>
         <long>
           Indicates whether a beep should sound in the
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 90928c6..d17826a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,8 +2,9 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 [type: gettext/glade]data/financial.ui
-data/gcalctool.desktop.in
 [type: gettext/glade]data/gcalctool.ui
+data/gcalctool.desktop.in
+data/gcalctool.schemas.in
 gcalctool/calctool.c
 gcalctool/display.c
 gcalctool/dsfuns.c